Commit dea8f3e9 by Baoxy

build: 修改文字提示/图标丢失

parent 8affeeed
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
<string name="edu_item_wlan">WLAN设置</string> <string name="edu_item_wlan">WLAN设置</string>
<string name="edu_item_appuse">应用使用情况</string> <string name="edu_item_appuse">应用使用情况</string>
<string name="edu_item_about">关于</string> <string name="edu_item_about">关于</string>
<string name="edu_item_buy">购买</string> <string name="edu_item_buy">购买方式</string>
<string name="edu_item_pwd_manager">密码管理</string> <string name="edu_item_pwd_manager">密码管理</string>
<string name="edu_item_privacy">隐私条款</string> <string name="edu_item_privacy">隐私条款</string>
<string name="edu_item_unique">唯一标识</string> <string name="edu_item_unique">唯一标识</string>
...@@ -385,6 +385,4 @@ ...@@ -385,6 +385,4 @@
<string name="edu_item_app_use_total">使用总时长: %1$s分钟</string> <string name="edu_item_app_use_total">使用总时长: %1$s分钟</string>
</resources> </resources>
...@@ -197,7 +197,7 @@ public class Launcher extends BaseActivity ...@@ -197,7 +197,7 @@ public class Launcher extends BaseActivity
implements LauncherExterns, View.OnClickListener, OnLongClickListener, implements LauncherExterns, View.OnClickListener, OnLongClickListener,
LauncherModel.Callbacks, View.OnTouchListener, LauncherProviderChangeListener, LauncherModel.Callbacks, View.OnTouchListener, LauncherProviderChangeListener,
AccessibilityManager.AccessibilityStateChangeListener { AccessibilityManager.AccessibilityStateChangeListener {
public static final String TAG = "Launcher"; public static final String TAG = "Launcher.Launcher";
private static final String ACTION_CHANGE_WALLPAPER = "action_change_wallpaper"; private static final String ACTION_CHANGE_WALLPAPER = "action_change_wallpaper";
static final boolean LOGD = false; static final boolean LOGD = false;
...@@ -1190,7 +1190,6 @@ public class Launcher extends BaseActivity ...@@ -1190,7 +1190,6 @@ public class Launcher extends BaseActivity
mMoveToDefaultScreenFromNewIntent = false; mMoveToDefaultScreenFromNewIntent = false;
updateInteraction(Workspace.State.NORMAL, mWorkspace.getState()); updateInteraction(Workspace.State.NORMAL, mWorkspace.getState());
mWorkspace.onResume(); mWorkspace.onResume();
if (!isWorkspaceLoading()) { if (!isWorkspaceLoading()) {
// Process any items that were added while Launcher was away. // Process any items that were added while Launcher was away.
InstallShortcutReceiver.disableAndFlushInstallQueue(this); InstallShortcutReceiver.disableAndFlushInstallQueue(this);
...@@ -2583,6 +2582,7 @@ public class Launcher extends BaseActivity ...@@ -2583,6 +2582,7 @@ public class Launcher extends BaseActivity
} }
} else if (isAppsViewVisible()) { } else if (isAppsViewVisible()) {
ued.logActionCommand(Action.Command.BACK, ContainerType.ALLAPPS); ued.logActionCommand(Action.Command.BACK, ContainerType.ALLAPPS);
forceReload();
showWorkspace(true); showWorkspace(true);
} else if (isWidgetsViewVisible()) { } else if (isWidgetsViewVisible()) {
ued.logActionCommand(Action.Command.BACK, ContainerType.WIDGETS); ued.logActionCommand(Action.Command.BACK, ContainerType.WIDGETS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment