From 1ff2be0dcea0cb0191963f8ec145802541d9e647 Mon Sep 17 00:00:00 2001 From: Alex Mang Date: Mon, 9 Mar 2020 12:57:11 -0700 Subject: [PATCH 1/7] [DO NOT MERGE] Initiailize APP_SEARCH_IMRPOVEMENT flag outside DEBUG builds. This is addressing a bug where flags are only changed on debug build devices or initially when changes. When nexuslauncher restarts the flag is no longer retrieved. Change-Id: Ieb6f460a271c918ee4e493b34692244f39cb3740 (cherry picked from commit e1664fcf1486d337ea998ded70d092590a0bfbd9) --- src/com/android/launcher3/config/BaseFlags.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index cd7444bba9..b264b798c0 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -132,6 +132,7 @@ public abstract class BaseFlags { } } } + APP_SEARCH_IMPROVEMENTS.initialize(context); } static List getTogglableFlags() { From 9720993e9d58636762297e87ce10b5a14c30a521 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Wed, 18 Mar 2020 22:23:49 +0000 Subject: [PATCH 2/7] Revert "[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag" This reverts commit a299714c7a080b87fab4bb0f1a9c15231558b8c4. Reason for revert: PM decided to keep it on until R release to not have press write about feature going away. Change-Id: I83c21e3938c38632e267498ba326d0da075e5dc8 --- src/com/android/launcher3/config/BaseFlags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index cd7444bba9..64d236fabe 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -109,7 +109,7 @@ public abstract class BaseFlags { "Rotate launcher UI instead of using transposed layout"); public static final TogglableFlag FOLDER_NAME_SUGGEST = new TogglableFlag( - "FOLDER_NAME_SUGGEST", false, + "FOLDER_NAME_SUGGEST", true, "Suggests folder names instead of blank text."); public static final TogglableFlag APP_SEARCH_IMPROVEMENTS = new TogglableFlag( From 365277a37a4d379c1ea016b3dee4335a9e111b67 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Wed, 18 Mar 2020 16:22:57 -0700 Subject: [PATCH 3/7] Final strings for work profile and hybrid hotseat Bug: 151831282 Bug: 142753423 Change-Id: I11dd21c3854b8b33fc44b2e49ca0e62c24da3310 --- .../hybridhotseat/HotseatEduDialog.java | 17 ------------- quickstep/res/values/strings.xml | 25 ++++++++----------- res/layout/work_tab_footer.xml | 1 + res/values/strings.xml | 17 ++++++------- .../launcher3/views/WorkFooterContainer.java | 2 -- 5 files changed, 19 insertions(+), 43 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java index 538b7f3952..7986c269bc 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java @@ -35,7 +35,6 @@ import com.android.launcher3.Insettable; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.WorkspaceItemInfo; -import com.android.launcher3.WorkspaceLayoutManager; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.UserEventDispatcher; @@ -54,9 +53,6 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable private static final int DEFAULT_CLOSE_DURATION = 200; protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000; - // We don't migrate if user has more than SAME_PAGE_MAX_ROWS rows of item in their screen - private static final int SAME_PAGE_MAX_ROWS = 2; - private static final int MIGRATE_SAME_PAGE = 0; private static final int MIGRATE_NEW_PAGE = 1; private static final int MIGRATE_NO_MIGRATE = 2; @@ -228,19 +224,6 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable if (FeatureFlags.HOTSEAT_MIGRATE_NEW_PAGE.get()) { mEduContent.setText(R.string.hotseat_edu_message_migrate_alt); mMigrationMode = MIGRATE_NEW_PAGE; - return; - } - CellLayout page = mLauncher.getWorkspace().getScreenWithId( - WorkspaceLayoutManager.FIRST_SCREEN_ID); - - int maxItemsOnPage = SAME_PAGE_MAX_ROWS * mLauncher.getDeviceProfile().inv.numColumns - + (FeatureFlags.QSB_ON_FIRST_SCREEN ? 1 : 0); - if (page.getShortcutsAndWidgets().getChildCount() > maxItemsOnPage - || !page.makeSpaceForHotseatMigration(false)) { - mMigrationMode = MIGRATE_NO_MIGRATE; - mEduContent.setText(R.string.hotseat_edu_message_no_migrate); - mEduHeading.setText(R.string.hotseat_edu_title_no_migrate); - mDismissBtn.setVisibility(GONE); } } diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index 90d42456d2..b55b042dda 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -68,30 +68,25 @@ - Get app suggestions based on your routines + Easily access your most-used apps - Tap to set up - + Pixel predicts apps you\’ll need next, right on your Home screen. Tap to set up. - Suggested apps replace the bottom row of apps - Your hotseat items will be moved up on the homescreen - Your hotseat items will be moved to the last page of your workspace + Get app suggestions on the bottom row of your Home screen - - - Suggested apps will be found at the bottom row of your home screen - Drag one or many apps off the bottom row of home screen to see app suggestions + Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your Home screen. + Easily access your most-used apps, right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move to a new folder. - Bottom row of apps moved up. - Bottom row of apps moved to last page. + Your hotseat items have been moved up to your homescreen + Your hotseat items have been moved to a folder - Bottom row won\'t be replaced. Manually drag apps for predictions. + Drag apps off the bottom row to see app suggestions - Got it + Get app suggestions - No thanks + No thanks diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml index dbcdbdb88f..264e27375c 100644 --- a/res/layout/work_tab_footer.xml +++ b/res/layout/work_tab_footer.xml @@ -41,6 +41,7 @@ android:lines="1" android:minHeight="24dp" android:paddingEnd="12dp" + android:text="@string/work_profile_toggle_label" android:textSize="16sp"/> Work profile - Personal apps are private & can\'t be seen by IT + Personal data is separate & hidden from work apps - Work apps are badged & visible to IT + Work apps & data are visible to your IT admin Next Got it - - Work apps: On - - Work apps: Paused + + Work profile is paused + + Work apps can\’t send you notifications, use your battery, or access your location - Work apps are paused - You won\'t get any work notifications, and your IT admin can\'t see your location + + Pause work apps and notifications Failed: %1$s diff --git a/src/com/android/launcher3/views/WorkFooterContainer.java b/src/com/android/launcher3/views/WorkFooterContainer.java index 9ac82301eb..d86d0ffd89 100644 --- a/src/com/android/launcher3/views/WorkFooterContainer.java +++ b/src/com/android/launcher3/views/WorkFooterContainer.java @@ -112,8 +112,6 @@ public class WorkFooterContainer extends LinearLayout implements Insettable { boolean anyProfileQuietModeEnabled = UserCache.INSTANCE.get( getContext()).isAnyProfileQuietModeEnabled(); - mWorkModeLabel.setText(anyProfileQuietModeEnabled - ? R.string.work_mode_off_label : R.string.work_mode_on_label); mWorkModeLabel.setCompoundDrawablesWithIntrinsicBounds( anyProfileQuietModeEnabled ? R.drawable.ic_corp_off : R.drawable.ic_corp, 0, 0, 0); mWorkModeSwitch.refresh(); From 3fd9d785eae40de41694a92db0b098fe572f505f Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 18 Mar 2020 22:06:50 -0700 Subject: [PATCH 4/7] Import translations. DO NOT MERGE BUG: 151750123 Auto-generated-cl: translation import Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74 --- res/values-rm/strings.xml | 203 -------------------------------------- 1 file changed, 203 deletions(-) delete mode 100644 res/values-rm/strings.xml diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml deleted file mode 100644 index 0758148f58..0000000000 --- a/res/values-rm/strings.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 59346999ba6449ab37f96e92c1aa8bfd5ee13eaf Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 18 Mar 2020 22:06:50 -0700 Subject: [PATCH 5/7] Import translations. DO NOT MERGE BUG: 151750123 Auto-generated-cl: translation import Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74 --- res/values-rm/strings.xml | 203 -------------------------------------- 1 file changed, 203 deletions(-) delete mode 100644 res/values-rm/strings.xml diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml deleted file mode 100644 index 0758148f58..0000000000 --- a/res/values-rm/strings.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 95cf9b05e411a8b0236011f79cf44f0167b17593 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 18 Mar 2020 22:06:50 -0700 Subject: [PATCH 6/7] Import translations. DO NOT MERGE BUG: 151750123 Auto-generated-cl: translation import Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74 --- res/values-rm/strings.xml | 203 -------------------------------------- 1 file changed, 203 deletions(-) delete mode 100644 res/values-rm/strings.xml diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml deleted file mode 100644 index 0758148f58..0000000000 --- a/res/values-rm/strings.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From e19a23a7ff6ab4a48ca814f45b3477fb070f22de Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 18 Mar 2020 22:06:50 -0700 Subject: [PATCH 7/7] Import translations. DO NOT MERGE BUG: 151750123 Auto-generated-cl: translation import Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74 --- res/values-rm/strings.xml | 203 -------------------------------------- 1 file changed, 203 deletions(-) delete mode 100644 res/values-rm/strings.xml diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml deleted file mode 100644 index 0758148f58..0000000000 --- a/res/values-rm/strings.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -