diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-23 15:33:32 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-23 15:33:32 -0800 |
commit | af5a66ec01619dc5a68ba43dc69809c03bb251e0 (patch) | |
tree | 4edd718012dbb06768654b018e0c9604d3f31717 | |
parent | cf5c3ec94437ec1c94b6e7f5051bd16d425558d9 (diff) | |
parent | 3088232f3004e5a0616b9e6a51d423cfe1679b98 (diff) | |
download | packages_apps_Trebuchet-af5a66ec01619dc5a68ba43dc69809c03bb251e0.tar.gz packages_apps_Trebuchet-af5a66ec01619dc5a68ba43dc69809c03bb251e0.tar.bz2 packages_apps_Trebuchet-af5a66ec01619dc5a68ba43dc69809c03bb251e0.zip |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0
-rw-r--r-- | res/values-az/cm_strings.xml | 20 | ||||
-rw-r--r-- | res/values-lb/cm_arrays.xml | 2 | ||||
-rw-r--r-- | res/values-lb/cm_strings.xml | 14 | ||||
-rw-r--r-- | res/values-zh-rTW/cm_strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 15 |
5 files changed, 47 insertions, 6 deletions
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml index 3ff201d4e..2a1f8701a 100644 --- a/res/values-az/cm_strings.xml +++ b/res/values-az/cm_strings.xml @@ -27,4 +27,24 @@ <string name="scrolling_page_outlines">Səhifə sərhədi</string> <string name="scrolling_fade_adjacent">Yan səhifələri soldur</string> <string name="scrolling_wallpaper">Divar kağızını sürüşdür</string> + <string name="grid_size_text">Tor ölçüsü</string> + <string name="grid_size_cozy">Rahat</string> + <string name="grid_size_condensed">Sıx</string> + <string name="grid_size_custom">Xüsusi</string> + <string name="grid_size_custom_and_size">Xüsusi (%1$s)</string> + <string name="preferences_interface_homescreen_custom">Xüsusi ölçü seçin</string> + <string name="scroll_effect_text">Sürüşdürmə effekti</string> + <string name="sort_mode_title">Başlıq</string> + <string name="sort_mode_launch_count">Başlatma sayı</string> + <string name="sort_mode_install_time">Quraşdırma müddəti</string> + <string name="home_screen_search_text">Axtarış sətri</string> + <string name="larger_icons_text">Böyük nişanlar</string> + <string name="icon_labels">Nişan etiketləri</string> + <string name="icon_labels_show">Göstər</string> + <string name="icon_labels_hide">Gizlət</string> + <string name="protected_app_settings">Qorunan tətbiqetmələr</string> + <string name="search_screen_left_text">Axtarış paneli</string> + <string name="dialog_confirm">Təsdiqlə</string> + <string name="permission_label_read_extension_data">DashClock əlavə verilənini istə</string> + <string name="permission_desc_read_extension_data">Tətbiqetmənin DashClock əlavə verilənini istəməsinə icazə verər</string> </resources> diff --git a/res/values-lb/cm_arrays.xml b/res/values-lb/cm_arrays.xml index a6db7282c..365ac5eec 100644 --- a/res/values-lb/cm_arrays.xml +++ b/res/values-lb/cm_arrays.xml @@ -21,7 +21,7 @@ <item>Erazoomen</item> <item>Erauszoomen</item> <item>Eroprotéieren</item> - <item>Rotate down</item> + <item>Erofrotéieren</item> <item>Cube eran</item> <item>Cube eraus</item> <item>Koup</item> diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml index d503499ad..af996b611 100644 --- a/res/values-lb/cm_strings.xml +++ b/res/values-lb/cm_strings.xml @@ -16,6 +16,8 @@ limitations under the License. --> <resources> + <string name="home_screen_settings">STARTSCHIERM-ASTELLUNGEN</string> + <string name="drawer_settings">ASTELLUNGE VUN DER APPIWWERSIICHT</string> <string name="app_settings">APP-ASTELLUNGEN</string> <string name="setting_state_on">UN</string> <string name="setting_state_off">AUS</string> @@ -26,13 +28,25 @@ <string name="scrolling_fade_adjacent">Säiten um Rand ausblenden</string> <string name="scrolling_wallpaper">Hannergrondbild scrollen</string> <string name="grid_size_text">Gittergréisst</string> + <string name="grid_size_comfortable">Gemittlech</string> + <string name="grid_size_cozy">Heemlech</string> + <string name="grid_size_condensed">Schmuel</string> <string name="grid_size_custom">Personaliséiert</string> + <string name="grid_size_custom_and_size">Personaliséiert (%1$s)</string> + <string name="preferences_interface_homescreen_custom">Personaliséiert Gréisst auswielen</string> <string name="scroll_effect_text">Scrolleffekt</string> <string name="drawer_sorting_text">Zortéiermodus</string> <string name="sort_mode_title">Titel</string> <string name="sort_mode_launch_count">Startunzuel</string> <string name="sort_mode_install_time">Installatiounszäit</string> <string name="home_screen_search_text">Sichkëscht</string> + <string name="larger_icons_text">Grouss Symboler</string> + <string name="icon_labels">Symbol-Beschrëftungen</string> + <string name="icon_labels_show">Uweisen</string> <string name="icon_labels_hide">Verstoppen</string> + <string name="protected_app_settings">Geschützt Appen</string> + <string name="search_screen_left_text">Sichpanneau</string> <string name="dialog_confirm">Bestätegen</string> + <string name="permission_label_read_extension_data">DashClock-Erweiderungsdaten ufroen</string> + <string name="permission_desc_read_extension_data">Erlaabt der App, DashClock-Erweiderungsdaten unzefuerderen</string> </resources> diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml index 0bf6e1b12..323ea2ff4 100644 --- a/res/values-zh-rTW/cm_strings.xml +++ b/res/values-zh-rTW/cm_strings.xml @@ -18,6 +18,7 @@ <resources> <string name="home_screen_settings">主螢幕設定</string> <string name="drawer_settings">抽屜設定</string> + <string name="app_settings">應用程式設定</string> <string name="setting_state_on">開啟</string> <string name="setting_state_off">關閉</string> <string name="search_panel_gel">Google 即時資訊</string> @@ -26,6 +27,7 @@ <string name="scrolling_wallpaper">滾動桌面</string> <string name="grid_size_condensed">密集</string> <string name="grid_size_custom">自訂</string> + <string name="grid_size_custom_and_size">自訂 (%1$s)</string> <string name="scroll_effect_text">滾動效果</string> <string name="drawer_sorting_text">排序模式</string> <string name="sort_mode_title">標題</string> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index edfcc6c9b..737cb0d30 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1166,8 +1166,6 @@ public class Launcher extends Activity } super.onResume(); - updateGridIfNeeded(); - // Restore the previous launcher state if (mOnResumeState == State.WORKSPACE) { showWorkspace(false); @@ -1281,6 +1279,8 @@ public class Launcher extends Activity } else { mHiddenFolderAuth = false; } + + updateGridIfNeeded(); } @Override @@ -1405,10 +1405,14 @@ public class Launcher extends Activity } public void setDynamicGridSize(DeviceProfile.GridSize size) { - SettingsProvider.putInt(this, - SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue()); + int gridSize = SettingsProvider.getIntCustomDefault(this, + SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, 0); + if (gridSize != size.getValue()) { + SettingsProvider.putInt(this, + SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue()); - updateDynamicGrid(); + setUpdateDynamicGrid(); + } mOverviewSettingsPanel.notifyDataSetInvalidated(); @@ -3766,6 +3770,7 @@ public class Launcher extends Activity // Change the state *after* we've called all the transition code mState = State.WORKSPACE; + setWorkspaceBackground(mState == State.WORKSPACE); // Resume the auto-advance of widgets mUserPresent = true; |