From b8f623db36a1de8703911949bafc418804f64a20 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Wed, 19 Nov 2014 08:12:01 -0800 Subject: Search Provider: Remove Action.ASSIST preference Always return to Trebuchet on return gesture. Change-Id: I92ca0dc3bfcb7763691a1d73381c2a6cebebdae3 --- .../android/launcher3/GelIntegrationHelper.java | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/com/android/launcher3/GelIntegrationHelper.java b/src/com/android/launcher3/GelIntegrationHelper.java index fbd6e5b16..5f5b81c50 100644 --- a/src/com/android/launcher3/GelIntegrationHelper.java +++ b/src/com/android/launcher3/GelIntegrationHelper.java @@ -68,6 +68,7 @@ public class GelIntegrationHelper { Intent homeIntent = new Intent(Intent.ACTION_MAIN); homeIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION); homeIntent.addCategory(Intent.CATEGORY_HOME); + homeIntent.setPackage(launcherActivity.getPackageName()); launcherActivity.startActivity(homeIntent); launcherActivity.overridePendingTransition(0, 0); dropEventsUntilLift(); @@ -80,16 +81,13 @@ public class GelIntegrationHelper { int edge = isLayoutRtl ? EDGE_GESTURE_SERVICE_LEFT_EDGE : EDGE_GESTURE_SERVICE_RIGHT_EDGE; edgeGestureManager.updateEdgeGestureActivationListener(mEdgeGestureActivationListener, edge); - // Attempt to use Intent.ACTION_ASSIST, if supported - Intent intent = new Intent(Intent.ACTION_ASSIST); - if (!isIntentSupported(launcherActivity, intent)) { - // Start the Global Search Activity - final SearchManager searchManager = - (SearchManager) launcherActivity.getSystemService(Context.SEARCH_SERVICE); - ComponentName globalSearchActivity = searchManager.getGlobalSearchActivity(); - intent = new Intent(); - intent.setComponent(globalSearchActivity); - } + + // Start the Global Search Activity + final SearchManager searchManager = + (SearchManager) launcherActivity.getSystemService(Context.SEARCH_SERVICE); + ComponentName globalSearchActivity = searchManager.getGlobalSearchActivity(); + Intent intent = new Intent(); + intent.setComponent(globalSearchActivity); try { launcherActivity.startActivity(intent); @@ -98,10 +96,4 @@ public class GelIntegrationHelper { Log.e(TAG, "Unable to launch global search activity."); } } - - private boolean isIntentSupported(Context context, Intent intent) { - PackageManager pm = context.getPackageManager(); - return pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null; - } - } -- cgit v1.2.3 From 11827406fcd38de7f4acbb7093de48c09a092142 Mon Sep 17 00:00:00 2001 From: Rajesh Yengisetty Date: Thu, 20 Nov 2014 22:47:33 +0000 Subject: Revert "Exclude empty and custom screens when centering wallpaper" This reverts commit f7bef2545ba45e8405dd5a00c0d276d669bf0ad0. Change-Id: Iee25ecd12eb5b7be9f14959336af6c6c49d88c25 --- src/com/android/launcher3/Workspace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 478b261e9..9813e6ca0 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1390,7 +1390,7 @@ public class Workspace extends SmoothPagedView } private float wallpaperOffsetForCurrentScroll() { - if (getNumScreensExcludingEmptyAndCustom() <= 1) { + if (getChildCount() <= 1) { return mWallpaperIsLiveWallpaper ? 0 : 0.5f; } -- cgit v1.2.3 From c69daed44efdd35e17933f4f1efeff4c7083150b Mon Sep 17 00:00:00 2001 From: Rajesh Yengisetty Date: Thu, 20 Nov 2014 22:47:39 +0000 Subject: Revert "Center wallpaper when only one screen" This reverts commit eacfd7fd535b4510cc43400c145c46db10110d08. Change-Id: I85fac84069cc10ad0c537104927af6bbe4be51f4 --- src/com/android/launcher3/Workspace.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 9813e6ca0..ecf618c4b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1337,7 +1337,7 @@ public class Workspace extends SmoothPagedView float mAnimationStartOffset; private final int ANIMATION_DURATION = 250; // Don't use all the wallpaper for parallax until you have at least this many pages - private final int MIN_PARALLAX_PAGE_SPAN = 2; + private final int MIN_PARALLAX_PAGE_SPAN = 3; int mNumScreens; boolean mCompletedInitialOffset; @@ -1391,7 +1391,7 @@ public class Workspace extends SmoothPagedView private float wallpaperOffsetForCurrentScroll() { if (getChildCount() <= 1) { - return mWallpaperIsLiveWallpaper ? 0 : 0.5f; + return 0; } // Exclude the leftmost page -- cgit v1.2.3 From ca7fbbb1374959adf32aacc00d27d11e72def03a Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Fri, 21 Nov 2014 11:17:20 -0800 Subject: Fix: Restore workspace gradients when returning from Widget drop Change-Id: I08927ea359460f60cebe1b942273a24eea8f86d5 --- src/com/android/launcher3/Launcher.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index edfcc6c9b..7cf92a8bc 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3766,6 +3766,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; -- cgit v1.2.3 From 3e6500ca2393b2bdfb94b8b02b9ad6ab5e24c32d Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Tue, 25 Nov 2014 16:04:52 -0800 Subject: Delay reloading Dynamic grid after size change till onResume or settings panel collapses Change-Id: I1077921d8c59172d63a8fc5fb287ff26a38e3e93 --- src/com/android/launcher3/Launcher.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7cf92a8bc..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(); -- cgit v1.2.3 From 3088232f3004e5a0616b9e6a51d423cfe1679b98 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 20 Dec 2014 04:22:34 +0200 Subject: Automatic translation import Change-Id: I902d7b2e42abc4f90b57fef587f87c11c0704189 --- res/values-az/cm_strings.xml | 20 ++++++++++++++++++++ res/values-lb/cm_arrays.xml | 2 +- res/values-lb/cm_strings.xml | 14 ++++++++++++++ res/values-zh-rTW/cm_strings.xml | 2 ++ 4 files changed, 37 insertions(+), 1 deletion(-) 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 @@ Səhifə sərhədi Yan səhifələri soldur Divar kağızını sürüşdür + Tor ölçüsü + Rahat + Sıx + Xüsusi + Xüsusi (%1$s) + Xüsusi ölçü seçin + Sürüşdürmə effekti + Başlıq + Başlatma sayı + Quraşdırma müddəti + Axtarış sətri + Böyük nişanlar + Nişan etiketləri + Göstər + Gizlət + Qorunan tətbiqetmələr + Axtarış paneli + Təsdiqlə + DashClock əlavə verilənini istə + Tətbiqetmənin DashClock əlavə verilənini istəməsinə icazə verər 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 @@ Erazoomen Erauszoomen Eroprotéieren - Rotate down + Erofrotéieren Cube eran Cube eraus Koup 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. --> + STARTSCHIERM-ASTELLUNGEN + ASTELLUNGE VUN DER APPIWWERSIICHT APP-ASTELLUNGEN UN AUS @@ -26,13 +28,25 @@ Säiten um Rand ausblenden Hannergrondbild scrollen Gittergréisst + Gemittlech + Heemlech + Schmuel Personaliséiert + Personaliséiert (%1$s) + Personaliséiert Gréisst auswielen Scrolleffekt Zortéiermodus Titel Startunzuel Installatiounszäit Sichkëscht + Grouss Symboler + Symbol-Beschrëftungen + Uweisen Verstoppen + Geschützt Appen + Sichpanneau Bestätegen + DashClock-Erweiderungsdaten ufroen + Erlaabt der App, DashClock-Erweiderungsdaten unzefuerderen 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 @@ 主螢幕設定 抽屜設定 + 應用程式設定 開啟 關閉 Google 即時資訊 @@ -26,6 +27,7 @@ 滾動桌面 密集 自訂 + 自訂 (%1$s) 滾動效果 排序模式 標題 -- cgit v1.2.3