Merge "Fixing state not set properly when configuration changes and remote animation callback comes after threshold is crossed" into ub-launcher3-master
diff --git a/Android.bp b/Android.bp
index aefc1f0..2608280 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,6 +23,7 @@
srcs: [
"tests/tapl/**/*.java",
"quickstep/src/com/android/quickstep/SwipeUpSetting.java",
+ "src/com/android/launcher3/util/SecureSettingsObserver.java",
"src/com/android/launcher3/TestProtocol.java",
],
platform_apis: true,
diff --git a/Android.mk b/Android.mk
index b8e6c85..15daf1f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,7 +53,6 @@
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 28
LOCAL_MODULE := LauncherPluginLib
-LOCAL_PRIVILEGED_MODULE := true
include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -69,7 +68,7 @@
androidx.recyclerview_recyclerview \
androidx.dynamicanimation_dynamicanimation
-LOCAL_STATIC_JAVA_LIBRARIES := libPluginCore
+LOCAL_STATIC_JAVA_LIBRARIES := LauncherPluginLib
LOCAL_SRC_FILES := \
$(call all-proto-files-under, protos) \
diff --git a/go/src_flags/com/android/launcher3/config/FeatureFlags.java b/go/src_flags/com/android/launcher3/config/FeatureFlags.java
index 6be9de8..a90808c 100644
--- a/go/src_flags/com/android/launcher3/config/FeatureFlags.java
+++ b/go/src_flags/com/android/launcher3/config/FeatureFlags.java
@@ -22,14 +22,10 @@
* Defines a set of flags used to control various launcher behaviors
*/
public final class FeatureFlags extends BaseFlags {
- private static FeatureFlags instance = new FeatureFlags();
-
- public static FeatureFlags getInstance(Context context) {
- return instance;
+ private FeatureFlags() {
+ // Prevent instantiation
}
- private FeatureFlags() {}
-
// Features to control Launcher3Go behavior
public static final boolean GO_DISABLE_WIDGETS = true;
public static final boolean LAUNCHER3_SPRING_ICONS = false;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index 5980d85..b406b30 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -117,6 +117,7 @@
launcher.getStateManager().addStateListener(new LauncherStateManager.StateListener() {
@Override
public void onStateSetImmediately(LauncherState state) {
+ onStateTransitionComplete(state);
}
@Override
@@ -142,6 +143,7 @@
launcher.getStateManager().addStateListener(new LauncherStateManager.StateListener() {
@Override
public void onStateSetImmediately(LauncherState state) {
+ onStateTransitionComplete(state);
}
@Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
index ca12951..88c362d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
@@ -43,7 +43,12 @@
}
public void addPluginListener(PluginListener<? extends Plugin> listener, Class<?> pluginClass) {
- mPluginManager.addPluginListener(listener, pluginClass);
+ addPluginListener(listener, pluginClass, false);
+ }
+
+ public void addPluginListener(PluginListener<? extends Plugin> listener, Class<?> pluginClass,
+ boolean allowMultiple) {
+ mPluginManager.addPluginListener(listener, pluginClass, allowMultiple);
}
public void removePluginListener(PluginListener<? extends Plugin> listener) {
diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
index 4417a3d..94ec69a 100644
--- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -52,6 +52,7 @@
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.AssistDataReceiver;
import com.android.systemui.shared.system.BackgroundExecutor;
+import com.android.systemui.shared.system.InputConsumerController;
import com.android.systemui.shared.system.NavigationBarCompat;
import com.android.systemui.shared.system.NavigationBarCompat.HitTarget;
import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
@@ -80,6 +81,7 @@
private final OverviewCallbacks mOverviewCallbacks;
private final TaskOverlayFactory mTaskOverlayFactory;
private final TouchInteractionLog mTouchInteractionLog;
+ private final InputConsumerController mInputConsumer;
private final boolean mIsDeferredDownTarget;
private final PointF mDownPos = new PointF();
@@ -101,8 +103,8 @@
RecentsModel recentsModel, Intent homeIntent, ActivityControlHelper activityControl,
MainThreadExecutor mainThreadExecutor, Choreographer backgroundThreadChoreographer,
@HitTarget int downHitTarget, OverviewCallbacks overviewCallbacks,
- TaskOverlayFactory taskOverlayFactory, VelocityTracker velocityTracker,
- TouchInteractionLog touchInteractionLog) {
+ TaskOverlayFactory taskOverlayFactory, InputConsumerController inputConsumer,
+ VelocityTracker velocityTracker, TouchInteractionLog touchInteractionLog) {
super(base);
mRunningTask = runningTaskInfo;
@@ -117,6 +119,7 @@
mTaskOverlayFactory = taskOverlayFactory;
mTouchInteractionLog = touchInteractionLog;
mTouchInteractionLog.setTouchConsumer(this);
+ mInputConsumer = inputConsumer;
}
@Override
@@ -226,7 +229,7 @@
RecentsAnimationState animationState = new RecentsAnimationState();
final WindowTransformSwipeHandler handler = new WindowTransformSwipeHandler(
animationState.id, mRunningTask, this, touchTimeMs, mActivityControlHelper,
- mTouchInteractionLog);
+ mInputConsumer, mTouchInteractionLog);
// Preload the plan
mRecentsModel.loadTasks(mRunningTask.id, null);
diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
index d71c08a..27f1399 100644
--- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java
+++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
@@ -15,23 +15,21 @@
*/
package com.android.quickstep;
+import static com.android.quickstep.SwipeUpSetting.newSwipeUpSettingsObserver;
import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_QUICK_SCRUB;
import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_SWIPE_UP;
import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON;
-import static com.android.systemui.shared.system.SettingsCompat.SWIPE_UP_SETTING_NAME;
-import android.content.ContentResolver;
import android.content.Context;
-import android.database.ContentObserver;
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
-import android.provider.Settings;
import android.util.Log;
import com.android.launcher3.Utilities;
import com.android.launcher3.allapps.DiscoveryBounce;
import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.launcher3.util.SecureSettingsObserver;
import com.android.launcher3.util.UiThreadHelper;
import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -60,7 +58,7 @@
private static final int MSG_SET_BACK_BUTTON_ALPHA = 201;
private static final int MSG_SET_SWIPE_UP_ENABLED = 202;
- private final SwipeUpGestureEnabledSettingObserver mSwipeUpSettingObserver;
+ private final SecureSettingsObserver mSwipeUpSettingObserver;
private final Context mContext;
private final Handler mUiHandler;
@@ -85,9 +83,11 @@
mBgHandler = new Handler(UiThreadHelper.getBackgroundLooper(), this::handleBgMessage);
if (SwipeUpSetting.isSwipeUpSettingAvailable()) {
- mSwipeUpSettingObserver = new SwipeUpGestureEnabledSettingObserver(mUiHandler,
- context.getContentResolver());
+ mSwipeUpSettingObserver =
+ newSwipeUpSettingsObserver(context, this::notifySwipeUpSettingChanged);
mSwipeUpSettingObserver.register();
+ mSwipeUpEnabled = mSwipeUpSettingObserver.getValue();
+ resetHomeBounceSeenOnQuickstepEnabledFirstTime();
} else {
mSwipeUpSettingObserver = null;
mSwipeUpEnabled = SwipeUpSetting.isSwipeUpEnabledDefaultValue();
@@ -192,34 +192,6 @@
sendToTarget();
}
- private class SwipeUpGestureEnabledSettingObserver extends ContentObserver {
- private ContentResolver mResolver;
- private final int defaultValue;
-
- SwipeUpGestureEnabledSettingObserver(Handler handler, ContentResolver resolver) {
- super(handler);
- mResolver = resolver;
- defaultValue = SwipeUpSetting.isSwipeUpEnabledDefaultValue() ? 1 : 0;
- }
-
- public void register() {
- mResolver.registerContentObserver(Settings.Secure.getUriFor(SWIPE_UP_SETTING_NAME),
- false, this);
- mSwipeUpEnabled = getValue();
- resetHomeBounceSeenOnQuickstepEnabledFirstTime();
- }
-
- @Override
- public void onChange(boolean selfChange) {
- super.onChange(selfChange);
- notifySwipeUpSettingChanged(getValue());
- }
-
- private boolean getValue() {
- return Settings.Secure.getInt(mResolver, SWIPE_UP_SETTING_NAME, defaultValue) == 1;
- }
- }
-
private void resetHomeBounceSeenOnQuickstepEnabledFirstTime() {
if (mSwipeUpEnabled && !Utilities.getPrefs(mContext).getBoolean(
HAS_ENABLED_QUICKSTEP_ONCE, true)) {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
index eea3971..2f3cb5f 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -53,24 +53,18 @@
new LooperExecutor(UiThreadHelper.getBackgroundLooper());
private final MainThreadExecutor mMainThreadExecutor = new MainThreadExecutor();
- private InputConsumerController mInputConsumer =
- InputConsumerController.getRecentsAnimationInputConsumer();
+ private final InputConsumerController mInputConsumer;
private final Supplier<TouchConsumer> mTouchProxySupplier;
- private boolean mInputConsumerUnregistered;
- private boolean mTouchProxyEnabled;
-
private TouchConsumer mTouchConsumer;
private boolean mTouchInProgress;
- private boolean mInputConsumerUnregisterPending;
private boolean mFinishPending;
- public RecentsAnimationWrapper(Supplier<TouchConsumer> touchProxySupplier) {
- // Register the input consumer on the UI thread, to ensure that it runs after any pending
- // unregister calls
+ public RecentsAnimationWrapper(InputConsumerController inputConsumer,
+ Supplier<TouchConsumer> touchProxySupplier) {
+ mInputConsumer = inputConsumer;
mTouchProxySupplier = touchProxySupplier;
- mMainThreadExecutor.execute(mInputConsumer::registerInputConsumer);
}
public synchronized void setController(
@@ -109,6 +103,7 @@
public void finish(boolean toHome, Runnable onFinishComplete) {
if (!toHome) {
mExecutorService.submit(() -> finishBg(false, onFinishComplete));
+ return;
}
mMainThreadExecutor.execute(() -> {
@@ -152,28 +147,12 @@
}
}
- public void unregisterInputConsumer() {
- mMainThreadExecutor.execute(this::unregisterInputConsumerUi);
- }
-
- private void unregisterInputConsumerUi() {
- if (mTouchProxyEnabled && mTouchInProgress) {
- mInputConsumerUnregisterPending = true;
- } else {
- mInputConsumerUnregistered = true;
- mInputConsumer.unregisterInputConsumer();
- }
- }
-
public void enableTouchProxy() {
mMainThreadExecutor.execute(this::enableTouchProxyUi);
}
private void enableTouchProxyUi() {
- if (!mInputConsumerUnregistered) {
- mTouchProxyEnabled = true;
- mInputConsumer.setTouchListener(this::onInputConsumerTouch);
- }
+ mInputConsumer.setTouchListener(this::onInputConsumerTouch);
}
private boolean onInputConsumerTouch(MotionEvent ev) {
@@ -184,10 +163,6 @@
} else if (action == ACTION_CANCEL || action == ACTION_UP) {
// Finish any pending actions
mTouchInProgress = false;
- if (mInputConsumerUnregisterPending) {
- mInputConsumerUnregisterPending = false;
- mInputConsumer.unregisterInputConsumer();
- }
if (mFinishPending) {
mFinishPending = false;
mExecutorService.submit(() -> finishBg(true, null));
diff --git a/quickstep/src/com/android/quickstep/SwipeUpSetting.java b/quickstep/src/com/android/quickstep/SwipeUpSetting.java
index 0f91f97..381ab9f 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpSetting.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpSetting.java
@@ -16,9 +16,15 @@
package com.android.quickstep;
+import static com.android.systemui.shared.system.SettingsCompat.SWIPE_UP_SETTING_NAME;
+
+import android.content.Context;
import android.content.res.Resources;
import android.util.Log;
+import com.android.launcher3.util.SecureSettingsObserver;
+import com.android.launcher3.util.SecureSettingsObserver.OnChangeListener;
+
public final class SwipeUpSetting {
private static final String TAG = "SwipeUpSetting";
@@ -47,4 +53,10 @@
public static boolean isSwipeUpEnabledDefaultValue() {
return getSystemBooleanRes(SWIPE_UP_ENABLED_DEFAULT_RES_NAME);
}
+
+ public static SecureSettingsObserver newSwipeUpSettingsObserver(Context context,
+ OnChangeListener listener) {
+ return new SecureSettingsObserver(context.getContentResolver(), listener,
+ SWIPE_UP_SETTING_NAME, isSwipeUpEnabledDefaultValue() ? 1 : 0);
+ }
}
diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index e64d04a..66ce4c3 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -64,7 +64,7 @@
protected T mSystemShortcut;
protected TaskSystemShortcut(T systemShortcut) {
- super(systemShortcut.iconResId, systemShortcut.labelResId);
+ super(systemShortcut);
mSystemShortcut = systemShortcut;
}
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index cded799..9371a4c 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -51,6 +51,7 @@
import com.android.systemui.shared.recents.ISystemUiProxy;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.ChoreographerCompat;
+import com.android.systemui.shared.system.InputConsumerController;
import com.android.systemui.shared.system.NavigationBarCompat.HitTarget;
import java.io.FileDescriptor;
@@ -185,6 +186,7 @@
private OverviewCallbacks mOverviewCallbacks;
private TaskOverlayFactory mTaskOverlayFactory;
private TouchInteractionLog mTouchInteractionLog;
+ private InputConsumerController mInputConsumer;
private Choreographer mMainThreadChoreographer;
private Choreographer mBackgroundThreadChoreographer;
@@ -203,6 +205,8 @@
mOverviewCallbacks = OverviewCallbacks.get(this);
mTaskOverlayFactory = TaskOverlayFactory.get(this);
mTouchInteractionLog = new TouchInteractionLog();
+ mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer();
+ mInputConsumer.registerInputConsumer();
sConnected = true;
@@ -213,6 +217,7 @@
@Override
public void onDestroy() {
+ mInputConsumer.unregisterInputConsumer();
mOverviewCommandHelper.onDestroy();
sConnected = false;
super.onDestroy();
@@ -256,7 +261,7 @@
mOverviewCommandHelper.overviewIntent,
mOverviewCommandHelper.getActivityControlHelper(), mMainThreadExecutor,
mBackgroundThreadChoreographer, downHitTarget, mOverviewCallbacks,
- mTaskOverlayFactory, tracker, mTouchInteractionLog);
+ mTaskOverlayFactory, mInputConsumer, tracker, mTouchInteractionLog);
}
}
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index dab5ddc..1c79f44 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -78,6 +78,7 @@
import com.android.quickstep.views.TaskView;
import com.android.systemui.shared.recents.model.ThumbnailData;
import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.InputConsumerController;
import com.android.systemui.shared.system.LatencyTrackerCompat;
import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -226,8 +227,7 @@
private @InteractionType int mInteractionType = INTERACTION_NORMAL;
- private final RecentsAnimationWrapper mRecentsAnimationWrapper =
- new RecentsAnimationWrapper(this::createNewTouchProxyHandler);
+ private final RecentsAnimationWrapper mRecentsAnimationWrapper;
private final long mTouchTimeMs;
private long mLauncherFrameDrawnTime;
@@ -241,7 +241,7 @@
WindowTransformSwipeHandler(int id, RunningTaskInfo runningTaskInfo, Context context,
long touchTimeMs, ActivityControlHelper<T> controller,
- TouchInteractionLog touchInteractionLog) {
+ InputConsumerController inputConsumer, TouchInteractionLog touchInteractionLog) {
this.id = id;
mContext = context;
mRunningTaskInfo = runningTaskInfo;
@@ -251,6 +251,8 @@
mActivityInitListener = mActivityControlHelper
.createActivityInitListener(this::onActivityInit);
mTouchInteractionLog = touchInteractionLog;
+ mRecentsAnimationWrapper = new RecentsAnimationWrapper(inputConsumer,
+ this::createNewTouchProxyHandler);
initStateCallbacks();
}
@@ -864,7 +866,6 @@
}
mActivityInitListener.unregister();
- mRecentsAnimationWrapper.unregisterInputConsumer();
mTaskSnapshot = null;
}
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 28928a8..c4afad7 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -208,8 +208,8 @@
private void addMenuOption(TaskSystemShortcut menuOption, OnClickListener onClickListener) {
ViewGroup menuOptionView = (ViewGroup) mActivity.getLayoutInflater().inflate(
R.layout.task_view_menu_option, this, false);
- menuOptionView.findViewById(R.id.icon).setBackgroundResource(menuOption.iconResId);
- ((TextView) menuOptionView.findViewById(R.id.text)).setText(menuOption.labelResId);
+ menuOption.setIconAndLabelFor(
+ menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text));
menuOptionView.setOnClickListener(onClickListener);
mOptionLayout.addView(menuOptionView);
}
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index a0615f5..c1424c4 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -387,8 +387,7 @@
for (TaskSystemShortcut menuOption : TaskMenuView.MENU_OPTIONS) {
OnClickListener onClickListener = menuOption.getOnClickListener(activity, this);
if (onClickListener != null) {
- info.addAction(new AccessibilityNodeInfo.AccessibilityAction(menuOption.labelResId,
- context.getText(menuOption.labelResId)));
+ info.addAction(menuOption.createAccessibilityAction(context));
}
}
@@ -409,7 +408,7 @@
}
for (TaskSystemShortcut menuOption : TaskMenuView.MENU_OPTIONS) {
- if (action == menuOption.labelResId) {
+ if (menuOption.hasHandlerForAction(action)) {
OnClickListener onClickListener = menuOption.getOnClickListener(
fromContext(getContext()), this);
if (onClickListener != null) {
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9aff1ff..7de4388 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -65,10 +65,10 @@
<string name="folder_hint_text" msgid="6617836969016293992">"תיקיה ללא שם"</string>
<string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> מושבתת"</string>
<plurals name="badged_app_label" formatted="false" msgid="7948068486082879291">
- <item quantity="two">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> הודעות</item>
- <item quantity="many">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> הודעות</item>
- <item quantity="other">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> הודעות</item>
- <item quantity="one">לאפליקציה <xliff:g id="APP_NAME_0">%1$s</xliff:g> יש הודעה אחת (<xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g>)</item>
+ <item quantity="two">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> התראות</item>
+ <item quantity="many">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> התראות</item>
+ <item quantity="other">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> התראות</item>
+ <item quantity="one">לאפליקציה <xliff:g id="APP_NAME_0">%1$s</xliff:g> יש התראה אחת (<xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g>)</item>
</plurals>
<string name="default_scroll_format" msgid="7475544710230993317">"דף %1$d מתוך %2$d"</string>
<string name="workspace_scroll_format" msgid="8458889198184077399">"מסך דף הבית %1$d מתוך %2$d"</string>
@@ -85,11 +85,11 @@
<string name="msg_disabled_by_admin" msgid="6898038085516271325">"הושבת על ידי מנהל המערכת שלך"</string>
<string name="allow_rotation_title" msgid="7728578836261442095">"אפשרות סיבוב של מסך דף הבית"</string>
<string name="allow_rotation_desc" msgid="8662546029078692509">"כאשר הטלפון מסובב"</string>
- <string name="icon_badging_title" msgid="874121399231955394">"סימני הודעות"</string>
+ <string name="icon_badging_title" msgid="874121399231955394">"סימני ההתראות"</string>
<string name="icon_badging_desc_on" msgid="2627952638544674079">"מופעלת"</string>
<string name="icon_badging_desc_off" msgid="5503319969924580241">"כבויה"</string>
- <string name="title_missing_notification_access" msgid="7503287056163941064">"נדרשת גישה להודעות"</string>
- <string name="msg_missing_notification_access" msgid="281113995110910548">"כדי להציג את סימני ההודעות, יש להפעיל הודעות מהאפליקציה <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="title_missing_notification_access" msgid="7503287056163941064">"נדרשת גישה להתראות"</string>
+ <string name="msg_missing_notification_access" msgid="281113995110910548">"כדי להציג את סימני ההתראות,יש להפעיל התראות מהאפליקציה <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="title_change_settings" msgid="1376365968844349552">"שנה את ההגדרות"</string>
<string name="icon_badging_service_title" msgid="2309733118428242174">"הצגה של סימן ההודעות"</string>
<string name="auto_add_shortcuts_label" msgid="8222286205987725611">"הוספת סמל במסך דף הבית"</string>
@@ -137,7 +137,7 @@
<string name="action_deep_shortcut" msgid="2864038805849372848">"קיצורי דרך"</string>
<string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"קיצורי דרך והודעות"</string>
<string name="action_dismiss_notification" msgid="5909461085055959187">"סגור"</string>
- <string name="notification_dismissed" msgid="6002233469409822874">"ההודעה נסגרה"</string>
+ <string name="notification_dismissed" msgid="6002233469409822874">"ההתראה נסגרה"</string>
<string name="all_apps_personal_tab" msgid="4190252696685155002">"אישיות"</string>
<string name="all_apps_work_tab" msgid="4884822796154055118">"עבודה"</string>
<string name="work_profile_toggle_label" msgid="3081029915775481146">"פרופיל עבודה"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index f400832..d5188c9 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -73,7 +73,7 @@
<string name="workspace_new_page" msgid="257366611030256142">"ပင်မမျက်နှာပြင် စာမျက်နှာသစ်"</string>
<string name="folder_opened" msgid="94695026776264709">"ဖွင့်ထားသောအကန့်, <xliff:g id="WIDTH">%1$d</xliff:g> နှင့် <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="4625795376335528256">"ဖိုင်တွဲကို ပိတ်ရန် တို့ပါ"</string>
- <string name="folder_tap_to_rename" msgid="4017685068016979677">"အမည်ပြောင်းခြင်းကို သိမ်းဆည်းရန် တို့ပါ"</string>
+ <string name="folder_tap_to_rename" msgid="4017685068016979677">"အမည်ပြောင်းခြင်းကို သိမ်းရန် တို့ပါ"</string>
<string name="folder_closed" msgid="4100806530910930934">"ပိတ်ထားသောအကန့်"</string>
<string name="folder_renamed" msgid="1794088362165669656">"ပြောင်းလဲလိုက်သော အကန့်အမည် <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="folder_name_format" msgid="6629239338071103179">"အကန့်အမည်: <xliff:g id="NAME">%1$s</xliff:g>"</string>
diff --git a/res/xml/flag_preferences.xml b/res/xml/flag_preferences.xml
new file mode 100644
index 0000000..aea1a6a
--- /dev/null
+++ b/res/xml/flag_preferences.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="feature_flags"
+ android:persistent="false">
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 3bba73a..1df7c2f 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -52,4 +52,10 @@
android:defaultValue=""
android:persistent="false" />
+ <PreferenceScreen
+ android:fragment="com.android.launcher3.config.FlagTogglerPreferenceFragment"
+ android:key="flag_toggler"
+ android:persistent="false"
+ android:title="Feature flags"/>
+
</PreferenceScreen>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4b181d8..0395fbb 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1753,12 +1753,12 @@
@Override
public void bindScreens(IntArray orderedScreenIds) {
// Make sure the first screen is always at the start.
- if (FeatureFlags.getInstance(this).isQsbOnFirstScreenEnabled() &&
+ if (FeatureFlags.QSB_ON_FIRST_SCREEN.get() &&
orderedScreenIds.indexOf(Workspace.FIRST_SCREEN_ID) != 0) {
orderedScreenIds.removeValue(Workspace.FIRST_SCREEN_ID);
orderedScreenIds.add(0, Workspace.FIRST_SCREEN_ID);
LauncherModel.updateWorkspaceScreenOrder(this, orderedScreenIds);
- } else if (!FeatureFlags.getInstance(this).isQsbOnFirstScreenEnabled()
+ } else if (!FeatureFlags.QSB_ON_FIRST_SCREEN.get()
&& orderedScreenIds.isEmpty()) {
// If there are no screens, we need to have an empty screen
mWorkspace.addExtraEmptyScreen();
@@ -1775,8 +1775,7 @@
int count = orderedScreenIds.size();
for (int i = 0; i < count; i++) {
int screenId = orderedScreenIds.get(i);
- if (!FeatureFlags.getInstance(this).isQsbOnFirstScreenEnabled()
- || screenId != Workspace.FIRST_SCREEN_ID) {
+ if (!FeatureFlags.QSB_ON_FIRST_SCREEN.get() || screenId != Workspace.FIRST_SCREEN_ID) {
// No need to bind the first screen, as its always bound.
mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(screenId);
}
@@ -2286,6 +2285,8 @@
writer.print(" mPendingRequestArgs=" + mPendingRequestArgs);
writer.println(" mPendingActivityResult=" + mPendingActivityResult);
writer.println(" mRotationHelper: " + mRotationHelper);
+ // Extra logging for b/116853349
+ mDragLayer.dumpAlpha(writer);
dumpMisc(writer);
try {
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index b02182c..6bf5812 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -16,7 +16,7 @@
package com.android.launcher3;
-import static com.android.launcher3.SettingsActivity.NOTIFICATION_BADGING;
+import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
import android.content.ComponentName;
import android.content.ContentProviderClient;
@@ -33,7 +33,7 @@
import com.android.launcher3.notification.NotificationListener;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.Preconditions;
-import com.android.launcher3.util.SettingsObserver;
+import com.android.launcher3.util.SecureSettingsObserver;
public class LauncherAppState {
@@ -48,7 +48,7 @@
private final IconCache mIconCache;
private final WidgetPreviewLoader mWidgetCache;
private final InvariantDeviceProfile mInvariantDeviceProfile;
- private final SettingsObserver mNotificationBadgingObserver;
+ private final SecureSettingsObserver mNotificationBadgingObserver;
public static LauncherAppState getInstance(final Context context) {
return INSTANCE.get(context);
@@ -99,17 +99,17 @@
mNotificationBadgingObserver = null;
} else {
// Register an observer to rebind the notification listener when badging is re-enabled.
- mNotificationBadgingObserver = new SettingsObserver.Secure(
- mContext.getContentResolver()) {
- @Override
- public void onSettingChanged(boolean isNotificationBadgingEnabled) {
- if (isNotificationBadgingEnabled) {
- NotificationListener.requestRebind(new ComponentName(
- mContext, NotificationListener.class));
- }
- }
- };
- mNotificationBadgingObserver.register(NOTIFICATION_BADGING);
+ mNotificationBadgingObserver =
+ newNotificationSettingsObserver(mContext, this::onNotificationSettingsChanged);
+ mNotificationBadgingObserver.register();
+ mNotificationBadgingObserver.dispatchOnChange();
+ }
+ }
+
+ protected void onNotificationSettingsChanged(boolean isNotificationBadgingEnabled) {
+ if (isNotificationBadgingEnabled) {
+ NotificationListener.requestRebind(new ComponentName(
+ mContext, NotificationListener.class));
}
}
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index a423a90..7d62ada 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -70,9 +70,6 @@
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
public class LauncherProvider extends ContentProvider {
private static final String TAG = "LauncherProvider";
@@ -793,7 +790,7 @@
convertShortcutsToLauncherActivities(db);
case 26:
// QSB was moved to the grid. Clear the first row on screen 0.
- if (FeatureFlags.getInstance(mContext).isQsbOnFirstScreenEnabled() &&
+ if (FeatureFlags.QSB_ON_FIRST_SCREEN.get() &&
!LauncherDbUtils.prepareScreenZeroToHostQsb(mContext, db)) {
break;
}
diff --git a/src/com/android/launcher3/MainProcessInitializer.java b/src/com/android/launcher3/MainProcessInitializer.java
index 0028f97..a18dfde 100644
--- a/src/com/android/launcher3/MainProcessInitializer.java
+++ b/src/com/android/launcher3/MainProcessInitializer.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.graphics.IconShapeOverride;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.util.ResourceBasedOverride;
@@ -35,6 +36,7 @@
protected void init(Context context) {
FileLog.setDir(context.getApplicationContext().getFilesDir());
+ FeatureFlags.initialize(context);
IconShapeOverride.apply(context);
SessionCommitReceiver.applyDefaultUserPrefs(context);
}
diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java
index 1f80226..a17f614 100644
--- a/src/com/android/launcher3/SettingsActivity.java
+++ b/src/com/android/launcher3/SettingsActivity.java
@@ -18,6 +18,7 @@
import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;
+import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
import android.annotation.TargetApi;
import android.app.Activity;
@@ -25,7 +26,6 @@
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.Fragment;
-import android.app.FragmentManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -43,10 +43,11 @@
import android.widget.Adapter;
import android.widget.ListView;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.graphics.IconShapeOverride;
import com.android.launcher3.notification.NotificationListener;
import com.android.launcher3.util.ListViewHighlighter;
-import com.android.launcher3.util.SettingsObserver;
+import com.android.launcher3.util.SecureSettingsObserver;
import com.android.launcher3.views.ButtonPreference;
import java.util.Objects;
@@ -57,9 +58,9 @@
public class SettingsActivity extends Activity
implements PreferenceFragment.OnPreferenceStartFragmentCallback {
+ private static final String FLAGS_PREFERENCE_KEY = "flag_toggler";
+
private static final String ICON_BADGING_PREFERENCE_KEY = "pref_icon_badging";
- /** Hidden field Settings.Secure.NOTIFICATION_BADGING */
- public static final String NOTIFICATION_BADGING = "notification_badging";
/** Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS */
private static final String NOTIFICATION_ENABLED_LISTENERS = "enabled_notification_listeners";
@@ -111,7 +112,7 @@
*/
public static class LauncherSettingsFragment extends PreferenceFragment {
- private IconBadgingObserver mIconBadgingObserver;
+ private SecureSettingsObserver mIconBadgingObserver;
private String mPreferenceKey;
private boolean mPreferenceHighlighted = false;
@@ -126,6 +127,12 @@
getPreferenceManager().setSharedPreferencesName(LauncherFiles.SHARED_PREFERENCES_KEY);
addPreferencesFromResource(R.xml.launcher_preferences);
+ // Only show flag toggler UI if this build variant implements that.
+ Preference flagToggler = findPreference(FLAGS_PREFERENCE_KEY);
+ if (flagToggler != null && !FeatureFlags.showFlagTogglerUi()) {
+ getPreferenceScreen().removePreference(flagToggler);
+ }
+
ContentResolver resolver = getActivity().getContentResolver();
ButtonPreference iconBadgingPref =
@@ -138,9 +145,14 @@
getPreferenceScreen().removePreference(iconBadgingPref);
} else {
// Listen to system notification badge settings while this UI is active.
- mIconBadgingObserver = new IconBadgingObserver(
- iconBadgingPref, resolver, getFragmentManager());
- mIconBadgingObserver.register(NOTIFICATION_BADGING, NOTIFICATION_ENABLED_LISTENERS);
+ mIconBadgingObserver = newNotificationSettingsObserver(
+ getActivity(), new IconBadgingObserver(iconBadgingPref, resolver));
+ mIconBadgingObserver.register();
+ // Also listen if notification permission changes
+ mIconBadgingObserver.getResolver().registerContentObserver(
+ Settings.Secure.getUriFor(NOTIFICATION_ENABLED_LISTENERS), false,
+ mIconBadgingObserver);
+ mIconBadgingObserver.dispatchOnChange();
}
Preference iconShapeOverride = findPreference(IconShapeOverride.KEY_PREFERENCE);
@@ -246,22 +258,18 @@
* Content observer which listens for system badging setting changes,
* and updates the launcher badging setting subtext accordingly.
*/
- private static class IconBadgingObserver extends SettingsObserver.Secure {
+ private static class IconBadgingObserver implements SecureSettingsObserver.OnChangeListener {
private final ButtonPreference mBadgingPref;
private final ContentResolver mResolver;
- private final FragmentManager mFragmentManager;
- public IconBadgingObserver(ButtonPreference badgingPref, ContentResolver resolver,
- FragmentManager fragmentManager) {
- super(resolver);
+ public IconBadgingObserver(ButtonPreference badgingPref, ContentResolver resolver) {
mBadgingPref = badgingPref;
mResolver = resolver;
- mFragmentManager = fragmentManager;
}
@Override
- public void onSettingChanged(boolean enabled) {
+ public void onSettingsChanged(boolean enabled) {
int summary = enabled ? R.string.icon_badging_desc_on : R.string.icon_badging_desc_off;
boolean serviceEnabled = true;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 5e1c54c..11e601c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -480,7 +480,7 @@
* @param qsb an existing qsb to recycle or null.
*/
public void bindAndInitFirstWorkspaceScreen(View qsb) {
- if (!FeatureFlags.getInstance(getContext()).isQsbOnFirstScreenEnabled()) {
+ if (!FeatureFlags.QSB_ON_FIRST_SCREEN.get()) {
return;
}
// Add the first page
@@ -779,9 +779,7 @@
int id = mWorkspaceScreens.keyAt(i);
CellLayout cl = mWorkspaceScreens.valueAt(i);
// FIRST_SCREEN_ID can never be removed.
- boolean qsbFirstScreenEnabled =
- FeatureFlags.getInstance(getContext()).isQsbOnFirstScreenEnabled();
- if ((!qsbFirstScreenEnabled || id > FIRST_SCREEN_ID)
+ if ((!FeatureFlags.QSB_ON_FIRST_SCREEN.get() || id > FIRST_SCREEN_ID)
&& cl.getShortcutsAndWidgets().getChildCount() == 0) {
removeScreens.add(id);
}
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 5348349..90e195b 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -25,16 +25,22 @@
import android.view.ViewGroup;
import android.view.animation.Interpolator;
import android.widget.LinearLayout;
-
-import com.android.launcher3.R;
-import com.android.launcher3.anim.PropertySetter;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
+import com.android.launcher3.R;
+import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
+import com.android.systemui.plugins.AllAppsRow;
+import com.android.systemui.plugins.PluginListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class FloatingHeaderView extends LinearLayout implements
- ValueAnimator.AnimatorUpdateListener {
+ ValueAnimator.AnimatorUpdateListener, PluginListener<AllAppsRow> {
private final Rect mClip = new Rect(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
private final ValueAnimator mAnimator = ValueAnimator.ofInt(0, 0);
@@ -64,6 +70,9 @@
private AllAppsRecyclerView mMainRV;
private AllAppsRecyclerView mWorkRV;
private AllAppsRecyclerView mCurrentRV;
+ protected final Map<AllAppsRow, View> mPluginRows;
+ // Contains just the values of the above map so we can iterate without extracting a new list.
+ protected final List<View> mPluginRowViews;
private ViewGroup mParent;
private boolean mHeaderCollapsed;
private int mSnappedScrolledY;
@@ -82,6 +91,8 @@
public FloatingHeaderView(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
+ mPluginRows = new HashMap<>();
+ mPluginRowViews = new ArrayList<>();
}
@Override
@@ -90,6 +101,38 @@
mTabLayout = findViewById(R.id.tabs);
}
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ PluginManagerWrapper.INSTANCE.get(getContext()).addPluginListener(this,
+ AllAppsRow.class, true /* allowMultiple */);
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ PluginManagerWrapper.INSTANCE.get(getContext()).removePluginListener(this);
+ }
+
+ @Override
+ public void onPluginConnected(AllAppsRow allAppsRowPlugin, Context context) {
+ mPluginRows.put(allAppsRowPlugin, null);
+ setupPluginRows();
+ allAppsRowPlugin.setOnHeightUpdatedListener(this::onPluginRowHeightUpdated);
+ }
+
+ protected void onPluginRowHeightUpdated() {
+ }
+
+ @Override
+ public void onPluginDisconnected(AllAppsRow plugin) {
+ View pluginRowView = mPluginRows.get(plugin);
+ removeView(pluginRowView);
+ mPluginRows.remove(plugin);
+ mPluginRowViews.remove(pluginRowView);
+ onPluginRowHeightUpdated();
+ }
+
public void setup(AllAppsContainerView.AdapterHolder[] mAH, boolean tabsHidden) {
mTabsHidden = tabsHidden;
mTabLayout.setVisibility(tabsHidden ? View.GONE : View.VISIBLE);
@@ -97,9 +140,24 @@
mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);
mParent = (ViewGroup) mMainRV.getParent();
setMainActive(mMainRVActive || mWorkRV == null);
+ setupPluginRows();
reset(false);
}
+ private void setupPluginRows() {
+ for (Map.Entry<AllAppsRow, View> rowPluginEntry : mPluginRows.entrySet()) {
+ if (rowPluginEntry.getValue() == null) {
+ View pluginRow = rowPluginEntry.getKey().setup(this);
+ addView(pluginRow, indexOfChild(mTabLayout));
+ rowPluginEntry.setValue(pluginRow);
+ mPluginRowViews.add(pluginRow);
+ }
+ }
+ for (View plugin : mPluginRowViews) {
+ plugin.setVisibility(mHeaderCollapsed ? GONE : VISIBLE);
+ }
+ }
+
private AllAppsRecyclerView setupRV(AllAppsRecyclerView old, AllAppsRecyclerView updated) {
if (old != updated && updated != null ) {
updated.addOnScrollListener(mOnScrollListener);
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java
index de842f5..dc60c8f 100644
--- a/src/com/android/launcher3/config/BaseFlags.java
+++ b/src/com/android/launcher3/config/BaseFlags.java
@@ -16,6 +16,21 @@
package com.android.launcher3.config;
+import static androidx.core.util.Preconditions.checkNotNull;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.Keep;
+
+import com.android.launcher3.Utilities;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
/**
* Defines a set of flags used to control various launcher behaviors.
*
@@ -23,11 +38,21 @@
*
* <p>This class is kept package-private to prevent direct access.
*/
+@Keep
abstract class BaseFlags {
- private static final String TAG = "FeatureFlags";
+ private static final Object sLock = new Object();
+ @GuardedBy("sLock")
+ private static final List<TogglableFlag> sFlags = new ArrayList<>();
+
+ static final String FLAGS_PREF_NAME = "featureFlags";
BaseFlags() {
+ throw new UnsupportedOperationException("Don't instantiate BaseFlags");
+ }
+
+ public static boolean showFlagTogglerUi() {
+ return Utilities.IS_DEBUG_DEVICE;
}
public static final boolean IS_DOGFOOD_BUILD = false;
@@ -36,10 +61,12 @@
// When enabled the promise icon is visible in all apps while installation an app.
public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false;
- /** Feature flag to enable moving the QSB on the 0th screen of the workspace. */
- public boolean isQsbOnFirstScreenEnabled() {
- return true;
- }
+ public static final TogglableFlag QSB_ON_FIRST_SCREEN = new TogglableFlag("QSB_ON_FIRST_SCREEN",
+ true,
+ "Enable moving the QSB on the 0th screen of the workspace");
+
+ public static final TogglableFlag EXAMPLE_FLAG = new TogglableFlag("EXAMPLE_FLAG", true,
+ "An example flag that doesn't do anything. Useful for testing");
//Feature flag to enable pulling down navigation shade from workspace.
public static final boolean PULL_DOWN_STATUS_BAR = true;
@@ -56,4 +83,110 @@
// When true, overview shows screenshots in the orientation they were taken rather than
// trying to make them fit the orientation the device is in.
public static final boolean OVERVIEW_USE_SCREENSHOT_ORIENTATION = true;
+
+ public static void initialize(Context context) {
+ // Avoid the disk read for builds without the flags UI.
+ if (showFlagTogglerUi()) {
+ SharedPreferences sharedPreferences =
+ context.getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE);
+ synchronized (sLock) {
+ for (TogglableFlag flag : sFlags) {
+ flag.currentValue = sharedPreferences.getBoolean(flag.key, flag.defaultValue);
+ }
+ }
+ } else {
+ synchronized (sLock) {
+ for (TogglableFlag flag : sFlags) {
+ flag.currentValue = flag.defaultValue;
+ }
+ }
+ }
+ }
+
+ static List<TogglableFlag> getTogglableFlags() {
+ // By Java Language Spec 12.4.2
+ // https://docs.oracle.com/javase/specs/jls/se7/html/jls-12.html#jls-12.4.2, the
+ // TogglableFlag instances on BaseFlags will be created before those on the FeatureFlags
+ // subclass. This code handles flags that are redeclared in FeatureFlags, ensuring the
+ // FeatureFlags one takes priority.
+ SortedMap<String, TogglableFlag> flagsByKey = new TreeMap<>();
+ synchronized (sLock) {
+ for (TogglableFlag flag : sFlags) {
+ flagsByKey.put(flag.key, flag);
+ }
+ }
+ return new ArrayList<>(flagsByKey.values());
+ }
+
+ public static final class TogglableFlag {
+ private final String key;
+ private final boolean defaultValue;
+ private final String description;
+ private boolean currentValue;
+
+ TogglableFlag(
+ String key,
+ boolean defaultValue,
+ String description) {
+ this.key = checkNotNull(key);
+ this.defaultValue = defaultValue;
+ this.description = checkNotNull(description);
+ synchronized (sLock) {
+ sFlags.add(this);
+ }
+ }
+
+ String getKey() {
+ return key;
+ }
+
+ boolean getDefaultValue() {
+ return defaultValue;
+ }
+
+ /** Returns the value of the flag at process start, including any overrides present. */
+ public boolean get() {
+ return currentValue;
+ }
+
+ String getDescription() {
+ return description;
+ }
+
+ @Override
+ public String toString() {
+ return "TogglableFlag{"
+ + "key=" + key + ", "
+ + "defaultValue=" + defaultValue + ", "
+ + "description=" + description
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof TogglableFlag) {
+ TogglableFlag that = (TogglableFlag) o;
+ return (this.key.equals(that.getKey()))
+ && (this.defaultValue == that.getDefaultValue())
+ && (this.description.equals(that.getDescription()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h$ = 1;
+ h$ *= 1000003;
+ h$ ^= key.hashCode();
+ h$ *= 1000003;
+ h$ ^= defaultValue ? 1231 : 1237;
+ h$ *= 1000003;
+ h$ ^= description.hashCode();
+ return h$;
+ }
+ }
+
}
diff --git a/src/com/android/launcher3/config/FlagTogglerPreferenceFragment.java b/src/com/android/launcher3/config/FlagTogglerPreferenceFragment.java
new file mode 100644
index 0000000..0a1fd2f
--- /dev/null
+++ b/src/com/android/launcher3/config/FlagTogglerPreferenceFragment.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.config;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Process;
+import android.preference.PreferenceDataStore;
+import android.preference.PreferenceFragment;
+import android.preference.SwitchPreference;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.android.launcher3.R;
+import com.android.launcher3.config.BaseFlags.TogglableFlag;
+
+/**
+ * Dev-build only UI allowing developers to toggle flag settings. See {@link FeatureFlags}.
+ */
+public final class FlagTogglerPreferenceFragment extends PreferenceFragment {
+ private static final String TAG = "FlagTogglerPrefFrag";
+
+ private SharedPreferences mSharedPreferences;
+ private MenuItem saveButton;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.flag_preferences);
+ mSharedPreferences = getContext().getSharedPreferences(
+ FeatureFlags.FLAGS_PREF_NAME, Context.MODE_PRIVATE);
+
+ // For flag overrides we only want to store when the engineer chose to override the
+ // flag with a different value than the default. That way, when we flip flags in
+ // future, engineers will pick up the new value immediately. To accomplish this, we use a
+ // custom preference data store.
+ getPreferenceManager().setPreferenceDataStore(new PreferenceDataStore() {
+ @Override
+ public void putBoolean(String key, boolean value) {
+ for (TogglableFlag flag : FeatureFlags.getTogglableFlags()) {
+ if (flag.getKey().equals(key)) {
+ if (value == flag.getDefaultValue()) {
+ mSharedPreferences.edit().remove(key).apply();
+ } else {
+ mSharedPreferences.edit().putBoolean(key, value).apply();
+ }
+ }
+ }
+ }
+ });
+
+ for (TogglableFlag flag : FeatureFlags.getTogglableFlags()) {
+ SwitchPreference switchPreference = new SwitchPreference(getContext());
+ switchPreference.setKey(flag.getKey());
+ switchPreference.setDefaultValue(flag.getDefaultValue());
+ switchPreference.setChecked(getFlagStateFromSharedPrefs(flag));
+ switchPreference.setTitle(flag.getKey());
+ switchPreference.setSummaryOn(flag.getDefaultValue() ? "" : "overridden");
+ switchPreference.setSummaryOff(flag.getDefaultValue() ? "overridden" : "");
+ getPreferenceScreen().addPreference(switchPreference);
+ }
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ saveButton = menu.add("Apply");
+ saveButton.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item == saveButton) {
+ mSharedPreferences.edit().commit();
+ Log.e(TAG,
+ "Killing launcher process " + Process.myPid() + " to apply new flag values");
+ System.exit(0);
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onStop() {
+ boolean anyChanged = false;
+ for (TogglableFlag flag : FeatureFlags.getTogglableFlags()) {
+ anyChanged = anyChanged ||
+ getFlagStateFromSharedPrefs(flag) != flag.get();
+ }
+
+ if (anyChanged) {
+ Toast.makeText(
+ getContext(),
+ "Flag won't be applied until you restart launcher",
+ Toast.LENGTH_LONG).show();
+ }
+ super.onStop();
+ }
+
+ private boolean getFlagStateFromSharedPrefs(TogglableFlag flag) {
+ return mSharedPreferences.getBoolean(flag.getKey(), flag.getDefaultValue());
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/icons/BaseIconFactory.java b/src/com/android/launcher3/icons/BaseIconFactory.java
new file mode 100644
index 0000000..db723b7
--- /dev/null
+++ b/src/com/android/launcher3/icons/BaseIconFactory.java
@@ -0,0 +1,303 @@
+package com.android.launcher3.icons;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PaintFlagsDrawFilter;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.AdaptiveIconDrawable;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Process;
+import android.os.UserHandle;
+
+import com.android.launcher3.R;
+
+import static android.graphics.Paint.DITHER_FLAG;
+import static android.graphics.Paint.FILTER_BITMAP_FLAG;
+import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR;
+
+/**
+ * This class will be moved to androidx library. There shouldn't be any dependency outside
+ * this package.
+ */
+public class BaseIconFactory {
+
+ private static final int DEFAULT_WRAPPER_BACKGROUND = Color.WHITE;
+ public static final boolean ATLEAST_OREO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+
+ private final Rect mOldBounds = new Rect();
+ private final Context mContext;
+ private final Canvas mCanvas;
+ private final PackageManager mPm;
+ private final ColorExtractor mColorExtractor;
+ private boolean mDisableColorExtractor;
+
+ private int mFillResIconDpi;
+ private int mIconBitmapSize;
+
+ private IconNormalizer mNormalizer;
+ private ShadowGenerator mShadowGenerator;
+
+ private Drawable mWrapperIcon;
+ private int mWrapperBackgroundColor;
+
+ protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize) {
+ mContext = context.getApplicationContext();
+
+ mFillResIconDpi = fillResIconDpi;
+ mIconBitmapSize = iconBitmapSize;
+
+ mPm = mContext.getPackageManager();
+ mColorExtractor = new ColorExtractor();
+
+ mCanvas = new Canvas();
+ mCanvas.setDrawFilter(new PaintFlagsDrawFilter(DITHER_FLAG, FILTER_BITMAP_FLAG));
+ }
+
+ protected void clear() {
+ mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;
+ mDisableColorExtractor = false;
+ }
+
+ public ShadowGenerator getShadowGenerator() {
+ if (mShadowGenerator == null) {
+ mShadowGenerator = new ShadowGenerator(mContext);
+ }
+ return mShadowGenerator;
+ }
+
+ public IconNormalizer getNormalizer() {
+ if (mNormalizer == null) {
+ mNormalizer = new IconNormalizer(mContext);
+ }
+ return mNormalizer;
+ }
+
+ public BitmapInfo createIconBitmap(Intent.ShortcutIconResource iconRes) {
+ try {
+ Resources resources = mPm.getResourcesForApplication(iconRes.packageName);
+ if (resources != null) {
+ final int id = resources.getIdentifier(iconRes.resourceName, null, null);
+ // do not stamp old legacy shortcuts as the app may have already forgotten about it
+ return createBadgedIconBitmap(
+ resources.getDrawableForDensity(id, mFillResIconDpi),
+ Process.myUserHandle() /* only available on primary user */,
+ false /* do not apply legacy treatment */);
+ }
+ } catch (Exception e) {
+ // Icon not found.
+ }
+ return null;
+ }
+
+ public BitmapInfo createIconBitmap(Bitmap icon) {
+ if (mIconBitmapSize == icon.getWidth() && mIconBitmapSize == icon.getHeight()) {
+ return BitmapInfo.fromBitmap(icon);
+ }
+ return BitmapInfo.fromBitmap(
+ createIconBitmap(new BitmapDrawable(mContext.getResources(), icon), 1f));
+ }
+
+ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
+ boolean shrinkNonAdaptiveIcons) {
+ return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, false, null);
+ }
+
+ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
+ boolean shrinkNonAdaptiveIcons, boolean isInstantApp) {
+ return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, isInstantApp, null);
+ }
+
+ /**
+ * Creates bitmap using the source drawable and various parameters.
+ * The bitmap is visually normalized with other icons and has enough spacing to add shadow.
+ *
+ * @param icon source of the icon
+ * @param user info can be used for a badge
+ * @param shrinkNonAdaptiveIcons {@code true} if non adaptive icons should be treated
+ * @param isInstantApp info can be used for a badge
+ * @param scale returns the scale result from normalization
+ * @return a bitmap suitable for disaplaying as an icon at various system UIs.
+ */
+ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
+ boolean shrinkNonAdaptiveIcons, boolean isInstantApp, float[] scale) {
+ if (scale == null) {
+ scale = new float[1];
+ }
+ icon = normalizeAndWrapToAdaptiveIcon(icon, shrinkNonAdaptiveIcons, null, scale);
+ Bitmap bitmap = createIconBitmap(icon, scale[0]);
+ if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
+ mCanvas.setBitmap(bitmap);
+ getShadowGenerator().recreateIcon(Bitmap.createBitmap(bitmap), mCanvas);
+ mCanvas.setBitmap(null);
+ }
+
+ final Bitmap result;
+ if (user != null && !Process.myUserHandle().equals(user)) {
+ BitmapDrawable drawable = new FixedSizeBitmapDrawable(bitmap);
+ Drawable badged = mPm.getUserBadgedIcon(drawable, user);
+ if (badged instanceof BitmapDrawable) {
+ result = ((BitmapDrawable) badged).getBitmap();
+ } else {
+ result = createIconBitmap(badged, 1f);
+ }
+ } else if (isInstantApp) {
+ badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
+ result = bitmap;
+ } else {
+ result = bitmap;
+ }
+ return BitmapInfo.fromBitmap(result, mDisableColorExtractor ? null : mColorExtractor);
+ }
+
+ public Bitmap createScaledBitmapWithoutShadow(Drawable icon, boolean shrinkNonAdaptiveIcons) {
+ RectF iconBounds = new RectF();
+ float[] scale = new float[1];
+ icon = normalizeAndWrapToAdaptiveIcon(icon, shrinkNonAdaptiveIcons, iconBounds, scale);
+ return createIconBitmap(icon,
+ Math.min(scale[0], ShadowGenerator.getScaleForBounds(iconBounds)));
+ }
+
+ /**
+ * Sets the background color used for wrapped adaptive icon
+ */
+ public void setWrapperBackgroundColor(int color) {
+ mWrapperBackgroundColor = (Color.alpha(color) < 255) ? DEFAULT_WRAPPER_BACKGROUND : color;
+ }
+
+ /**
+ * Disables the dominant color extraction for all icons loaded.
+ */
+ public void disableColorExtraction() {
+ mDisableColorExtractor = true;
+ }
+
+ private Drawable normalizeAndWrapToAdaptiveIcon(Drawable icon, boolean shrinkNonAdaptiveIcons,
+ RectF outIconBounds, float[] outScale) {
+ float scale = 1f;
+
+ if (shrinkNonAdaptiveIcons) {
+ boolean[] outShape = new boolean[1];
+ if (mWrapperIcon == null) {
+ mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper)
+ .mutate();
+ }
+ AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon;
+ dr.setBounds(0, 0, 1, 1);
+ scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape);
+ if (ATLEAST_OREO && !outShape[0] && !(icon instanceof AdaptiveIconDrawable)) {
+ FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground());
+ fsd.setDrawable(icon);
+ fsd.setScale(scale);
+ icon = dr;
+ scale = getNormalizer().getScale(icon, outIconBounds, null, null);
+
+ ((ColorDrawable) dr.getBackground()).setColor(mWrapperBackgroundColor);
+ }
+ } else {
+ scale = getNormalizer().getScale(icon, outIconBounds, null, null);
+ }
+
+ outScale[0] = scale;
+ return icon;
+ }
+
+ /**
+ * Adds the {@param badge} on top of {@param target} using the badge dimensions.
+ */
+ public void badgeWithDrawable(Bitmap target, Drawable badge) {
+ mCanvas.setBitmap(target);
+ badgeWithDrawable(mCanvas, badge);
+ mCanvas.setBitmap(null);
+ }
+
+ /**
+ * Adds the {@param badge} on top of {@param target} using the badge dimensions.
+ */
+ public void badgeWithDrawable(Canvas target, Drawable badge) {
+ int badgeSize = mContext.getResources().getDimensionPixelSize(R.dimen.profile_badge_size);
+ badge.setBounds(mIconBitmapSize - badgeSize, mIconBitmapSize - badgeSize,
+ mIconBitmapSize, mIconBitmapSize);
+ badge.draw(target);
+ }
+
+ /**
+ * @param scale the scale to apply before drawing {@param icon} on the canvas
+ */
+ private Bitmap createIconBitmap(Drawable icon, float scale) {
+ Bitmap bitmap = Bitmap.createBitmap(mIconBitmapSize, mIconBitmapSize,
+ Bitmap.Config.ARGB_8888);
+ mCanvas.setBitmap(bitmap);
+ mOldBounds.set(icon.getBounds());
+
+ if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
+ int offset = Math.max((int) Math.ceil(BLUR_FACTOR * mIconBitmapSize),
+ Math.round(mIconBitmapSize * (1 - scale) / 2 ));
+ icon.setBounds(offset, offset, mIconBitmapSize - offset, mIconBitmapSize - offset);
+ icon.draw(mCanvas);
+ } else {
+ if (icon instanceof BitmapDrawable) {
+ BitmapDrawable bitmapDrawable = (BitmapDrawable) icon;
+ Bitmap b = bitmapDrawable.getBitmap();
+ if (bitmap != null && b.getDensity() == Bitmap.DENSITY_NONE) {
+ bitmapDrawable.setTargetDensity(mContext.getResources().getDisplayMetrics());
+ }
+ }
+ int width = mIconBitmapSize;
+ int height = mIconBitmapSize;
+
+ int intrinsicWidth = icon.getIntrinsicWidth();
+ int intrinsicHeight = icon.getIntrinsicHeight();
+ if (intrinsicWidth > 0 && intrinsicHeight > 0) {
+ // Scale the icon proportionally to the icon dimensions
+ final float ratio = (float) intrinsicWidth / intrinsicHeight;
+ if (intrinsicWidth > intrinsicHeight) {
+ height = (int) (width / ratio);
+ } else if (intrinsicHeight > intrinsicWidth) {
+ width = (int) (height * ratio);
+ }
+ }
+ final int left = (mIconBitmapSize - width) / 2;
+ final int top = (mIconBitmapSize - height) / 2;
+ icon.setBounds(left, top, left + width, top + height);
+ mCanvas.save();
+ mCanvas.scale(scale, scale, mIconBitmapSize / 2, mIconBitmapSize / 2);
+ icon.draw(mCanvas);
+ mCanvas.restore();
+
+ }
+ icon.setBounds(mOldBounds);
+ mCanvas.setBitmap(null);
+ return bitmap;
+ }
+
+ /**
+ * An extension of {@link BitmapDrawable} which returns the bitmap pixel size as intrinsic size.
+ * This allows the badging to be done based on the action bitmap size rather than
+ * the scaled bitmap size.
+ */
+ private static class FixedSizeBitmapDrawable extends BitmapDrawable {
+
+ public FixedSizeBitmapDrawable(Bitmap bitmap) {
+ super(null, bitmap);
+ }
+
+ @Override
+ public int getIntrinsicHeight() {
+ return getBitmap().getWidth();
+ }
+
+ @Override
+ public int getIntrinsicWidth() {
+ return getBitmap().getWidth();
+ }
+ }
+}
diff --git a/src/com/android/launcher3/icons/LauncherIcons.java b/src/com/android/launcher3/icons/LauncherIcons.java
index 244654b..69614a3 100644
--- a/src/com/android/launcher3/icons/LauncherIcons.java
+++ b/src/com/android/launcher3/icons/LauncherIcons.java
@@ -16,29 +16,11 @@
package com.android.launcher3.icons;
-import static android.graphics.Paint.DITHER_FLAG;
-import static android.graphics.Paint.FILTER_BITMAP_FLAG;
-
-import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR;
-
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.Intent.ShortcutIconResource;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.AdaptiveIconDrawable;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.PaintDrawable;
import android.os.Build;
import android.os.Process;
import android.os.UserHandle;
@@ -49,7 +31,6 @@
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.ItemInfoWithIcon;
import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.model.PackageItemInfo;
import com.android.launcher3.shortcuts.DeepShortcutManager;
@@ -60,14 +41,14 @@
import androidx.annotation.Nullable;
/**
- * Helper methods for generating various launcher icons
+ * Wrapper class to provide access to {@link BaseIconFactory} and also to provide pool of this class
+ * that are threadsafe.
*/
-public class LauncherIcons implements AutoCloseable {
+public class LauncherIcons extends BaseIconFactory implements AutoCloseable {
- private static final int DEFAULT_WRAPPER_BACKGROUND = Color.WHITE;
-
- public static final Object sPoolSync = new Object();
+ private static final Object sPoolSync = new Object();
private static LauncherIcons sPool;
+ private LauncherIcons next;
/**
* Return a new Message instance from the global pool. Allows us to
@@ -82,7 +63,8 @@
return m;
}
}
- return new LauncherIcons(context);
+ InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
+ return new LauncherIcons(context, idp.fillResIconDpi, idp.iconBitmapSize);
}
/**
@@ -91,8 +73,7 @@
public void recycle() {
synchronized (sPoolSync) {
// Clear any temporary state variables
- mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;
- mDisableColorExtractor = false;
+ clear();
next = sPool;
sPool = this;
@@ -104,259 +85,41 @@
recycle();
}
- private final Rect mOldBounds = new Rect();
private final Context mContext;
- private final Canvas mCanvas;
- private final PackageManager mPm;
- private final ColorExtractor mColorExtractor;
- private boolean mDisableColorExtractor;
-
private final int mFillResIconDpi;
private final int mIconBitmapSize;
- private IconNormalizer mNormalizer;
- private ShadowGenerator mShadowGenerator;
-
- private Drawable mWrapperIcon;
- private int mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;
-
- // sometimes we store linked lists of these things
- private LauncherIcons next;
-
- private LauncherIcons(Context context) {
+ private LauncherIcons(Context context, int fillResIconDpi, int iconBitmapSize) {
+ super(context, fillResIconDpi, iconBitmapSize);
mContext = context.getApplicationContext();
- mPm = mContext.getPackageManager();
- mColorExtractor = new ColorExtractor();
-
- InvariantDeviceProfile idp = LauncherAppState.getIDP(mContext);
- mFillResIconDpi = idp.fillResIconDpi;
- mIconBitmapSize = idp.iconBitmapSize;
-
- mCanvas = new Canvas();
- mCanvas.setDrawFilter(new PaintFlagsDrawFilter(DITHER_FLAG, FILTER_BITMAP_FLAG));
+ mFillResIconDpi = fillResIconDpi;
+ mIconBitmapSize = iconBitmapSize;
}
- public ShadowGenerator getShadowGenerator() {
- if (mShadowGenerator == null) {
- mShadowGenerator = new ShadowGenerator(mContext);
- }
- return mShadowGenerator;
+ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
+ int iconAppTargetSdk) {
+ return createBadgedIconBitmap(icon, user, iconAppTargetSdk, false);
}
- public IconNormalizer getNormalizer() {
- if (mNormalizer == null) {
- mNormalizer = new IconNormalizer(mContext);
- }
- return mNormalizer;
- }
-
- /**
- * Returns a bitmap suitable for the all apps view. If the package or the resource do not
- * exist, it returns null.
- */
- public BitmapInfo createIconBitmap(ShortcutIconResource iconRes) {
- try {
- Resources resources = mPm.getResourcesForApplication(iconRes.packageName);
- if (resources != null) {
- final int id = resources.getIdentifier(iconRes.resourceName, null, null);
- // do not stamp old legacy shortcuts as the app may have already forgotten about it
- return createBadgedIconBitmap(
- resources.getDrawableForDensity(id, mFillResIconDpi),
- Process.myUserHandle() /* only available on primary user */,
- 0 /* do not apply legacy treatment */);
- }
- } catch (Exception e) {
- // Icon not found.
- }
- return null;
- }
-
- /**
- * Returns a bitmap which is of the appropriate size to be displayed as an icon
- */
- public BitmapInfo createIconBitmap(Bitmap icon) {
- if (mIconBitmapSize == icon.getWidth() && mIconBitmapSize == icon.getHeight()) {
- return BitmapInfo.fromBitmap(icon);
- }
- return BitmapInfo.fromBitmap(
- createIconBitmap(new BitmapDrawable(mContext.getResources(), icon), 1f));
- }
-
- /**
- * Returns a bitmap suitable for displaying as an icon at various launcher UIs like all apps
- * view or workspace. The icon is badged for {@param user}.
- * The bitmap is also visually normalized with other icons.
- */
- public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user, int iconAppTargetSdk) {
- return createBadgedIconBitmap(icon, user, iconAppTargetSdk, false, null);
- }
-
- public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user, int iconAppTargetSdk,
- boolean isInstantApp) {
+ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
+ int iconAppTargetSdk, boolean isInstantApp) {
return createBadgedIconBitmap(icon, user, iconAppTargetSdk, isInstantApp, null);
}
- /**
- * Returns a bitmap suitable for displaying as an icon at various launcher UIs like all apps
- * view or workspace. The icon is badged for {@param user}.
- * The bitmap is also visually normalized with other icons.
- */
- public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user, int iconAppTargetSdk,
- boolean isInstantApp, float[] scale) {
- if (scale == null) {
- scale = new float[1];
- }
- icon = normalizeAndWrapToAdaptiveIcon(icon, iconAppTargetSdk, null, scale);
- Bitmap bitmap = createIconBitmap(icon, scale[0]);
- if (Utilities.ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
- mCanvas.setBitmap(bitmap);
- getShadowGenerator().recreateIcon(Bitmap.createBitmap(bitmap), mCanvas);
- mCanvas.setBitmap(null);
- }
-
- final Bitmap result;
- if (user != null && !Process.myUserHandle().equals(user)) {
- BitmapDrawable drawable = new FixedSizeBitmapDrawable(bitmap);
- Drawable badged = mPm.getUserBadgedIcon(drawable, user);
- if (badged instanceof BitmapDrawable) {
- result = ((BitmapDrawable) badged).getBitmap();
- } else {
- result = createIconBitmap(badged, 1f);
- }
- } else if (isInstantApp) {
- badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
- result = bitmap;
- } else {
- result = bitmap;
- }
- return BitmapInfo.fromBitmap(result, mDisableColorExtractor ? null : mColorExtractor);
+ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
+ int iconAppTargetSdk, boolean isInstantApp, float[] scale) {
+ boolean shrinkNonAdaptiveIcons = Utilities.ATLEAST_P ||
+ (Utilities.ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O);
+ return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, isInstantApp, scale);
}
- /**
- * Creates a normalized bitmap suitable for the all apps view. The bitmap is also visually
- * normalized with other icons and has enough spacing to add shadow.
- */
public Bitmap createScaledBitmapWithoutShadow(Drawable icon, int iconAppTargetSdk) {
- RectF iconBounds = new RectF();
- float[] scale = new float[1];
- icon = normalizeAndWrapToAdaptiveIcon(icon, iconAppTargetSdk, iconBounds, scale);
- return createIconBitmap(icon,
- Math.min(scale[0], ShadowGenerator.getScaleForBounds(iconBounds)));
+ boolean shrinkNonAdaptiveIcons = Utilities.ATLEAST_P ||
+ (Utilities.ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O);
+ return createScaledBitmapWithoutShadow(icon, shrinkNonAdaptiveIcons);
}
- /**
- * Sets the background color used for wrapped adaptive icon
- */
- public void setWrapperBackgroundColor(int color) {
- mWrapperBackgroundColor = (Color.alpha(color) < 255) ? DEFAULT_WRAPPER_BACKGROUND : color;
- }
-
- /**
- * Disables the dominant color extraction for all icons loaded through this session (until
- * this instance is recycled).
- */
- public void disableColorExtraction() {
- mDisableColorExtractor = true;
- }
-
- private Drawable normalizeAndWrapToAdaptiveIcon(Drawable icon, int iconAppTargetSdk,
- RectF outIconBounds, float[] outScale) {
- float scale = 1f;
- if ((Utilities.ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O) ||
- Utilities.ATLEAST_P) {
- boolean[] outShape = new boolean[1];
- if (mWrapperIcon == null) {
- mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper)
- .mutate();
- }
- AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon;
- dr.setBounds(0, 0, 1, 1);
- scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape);
- if (Utilities.ATLEAST_OREO && !outShape[0] && !(icon instanceof AdaptiveIconDrawable)) {
- FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground());
- fsd.setDrawable(icon);
- fsd.setScale(scale);
- icon = dr;
- scale = getNormalizer().getScale(icon, outIconBounds, null, null);
-
- ((ColorDrawable) dr.getBackground()).setColor(mWrapperBackgroundColor);
- }
- } else {
- scale = getNormalizer().getScale(icon, outIconBounds, null, null);
- }
-
- outScale[0] = scale;
- return icon;
- }
-
- /**
- * Adds the {@param badge} on top of {@param target} using the badge dimensions.
- */
- public void badgeWithDrawable(Bitmap target, Drawable badge) {
- mCanvas.setBitmap(target);
- badgeWithDrawable(mCanvas, badge);
- mCanvas.setBitmap(null);
- }
-
- /**
- * Adds the {@param badge} on top of {@param target} using the badge dimensions.
- */
- private void badgeWithDrawable(Canvas target, Drawable badge) {
- int badgeSize = mContext.getResources().getDimensionPixelSize(R.dimen.profile_badge_size);
- badge.setBounds(mIconBitmapSize - badgeSize, mIconBitmapSize - badgeSize,
- mIconBitmapSize, mIconBitmapSize);
- badge.draw(target);
- }
-
- /**
- * @param scale the scale to apply before drawing {@param icon} on the canvas
- */
- private Bitmap createIconBitmap(Drawable icon, float scale) {
- Bitmap bitmap = Bitmap.createBitmap(mIconBitmapSize, mIconBitmapSize,
- Bitmap.Config.ARGB_8888);
- mCanvas.setBitmap(bitmap);
- mOldBounds.set(icon.getBounds());
-
- if (Utilities.ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
- int offset = Math.max((int) Math.ceil(BLUR_FACTOR * mIconBitmapSize),
- Math.round(mIconBitmapSize * (1 - scale) / 2 ));
- icon.setBounds(offset, offset, mIconBitmapSize - offset, mIconBitmapSize - offset);
- icon.draw(mCanvas);
- } else {
- if (icon instanceof BitmapDrawable) {
- BitmapDrawable bitmapDrawable = (BitmapDrawable) icon;
- Bitmap b = bitmapDrawable.getBitmap();
- if (bitmap != null && b.getDensity() == Bitmap.DENSITY_NONE) {
- bitmapDrawable.setTargetDensity(mContext.getResources().getDisplayMetrics());
- }
- }
- int width = mIconBitmapSize;
- int height = mIconBitmapSize;
-
- int intrinsicWidth = icon.getIntrinsicWidth();
- int intrinsicHeight = icon.getIntrinsicHeight();
- if (intrinsicWidth > 0 && intrinsicHeight > 0) {
- // Scale the icon proportionally to the icon dimensions
- final float ratio = (float) intrinsicWidth / intrinsicHeight;
- if (intrinsicWidth > intrinsicHeight) {
- height = (int) (width / ratio);
- } else if (intrinsicHeight > intrinsicWidth) {
- width = (int) (height * ratio);
- }
- }
- final int left = (mIconBitmapSize - width) / 2;
- final int top = (mIconBitmapSize - height) / 2;
- icon.setBounds(left, top, left + width, top + height);
- mCanvas.save();
- mCanvas.scale(scale, scale, mIconBitmapSize / 2, mIconBitmapSize / 2);
- icon.draw(mCanvas);
- mCanvas.restore();
-
- }
- icon.setBounds(mOldBounds);
- mCanvas.setBitmap(null);
- return bitmap;
- }
+ // below methods should also migrate to BaseIconFactory
public BitmapInfo createShortcutIcon(ShortcutInfoCompat shortcutInfo) {
return createShortcutIcon(shortcutInfo, true /* badged */);
@@ -424,26 +187,4 @@
return pkgInfo;
}
}
-
- /**
- * An extension of {@link BitmapDrawable} which returns the bitmap pixel size as intrinsic size.
- * This allows the badging to be done based on the action bitmap size rather than
- * the scaled bitmap size.
- */
- private static class FixedSizeBitmapDrawable extends BitmapDrawable {
-
- public FixedSizeBitmapDrawable(Bitmap bitmap) {
- super(null, bitmap);
- }
-
- @Override
- public int getIntrinsicHeight() {
- return getBitmap().getWidth();
- }
-
- @Override
- public int getIntrinsicWidth() {
- return getBitmap().getWidth();
- }
- }
}
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 0115fd9..2c1aa74 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -12,6 +12,7 @@
import android.graphics.Point;
import android.net.Uri;
import android.util.Log;
+
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.LauncherAppState;
@@ -109,6 +110,7 @@
/**
* Applied all the pending DB operations
+ *
* @return true if any DB operation was commited.
*/
private boolean applyOperations() throws Exception {
@@ -135,6 +137,7 @@
* entries is more than what can fit in the new hotseat, we drop the entries with least weight.
* For weight calculation {@see #WT_SHORTCUT}, {@see #WT_APPLICATION}
* & {@see #WT_FOLDER_FACTOR}.
+ *
* @return true if any DB change was made
*/
protected boolean migrateHotseat() throws Exception {
@@ -235,7 +238,8 @@
int screenId = allScreens.get(i);
v.put(LauncherSettings.WorkspaceScreens._ID, screenId);
v.put(LauncherSettings.WorkspaceScreens.SCREEN_RANK, i);
- mUpdateOperations.add(ContentProviderOperation.newInsert(uri).withValues(v).build());
+ mUpdateOperations.add(ContentProviderOperation.newInsert(uri).withValues(
+ v).build());
}
}
return applyOperations();
@@ -254,8 +258,7 @@
protected void migrateScreen(int screenId) {
// If we are migrating the first screen, do not touch the first row.
int startY =
- (FeatureFlags.getInstance(mContext).isQsbOnFirstScreenEnabled()
- && screenId == Workspace.FIRST_SCREEN_ID)
+ (FeatureFlags.QSB_ON_FIRST_SCREEN.get() && screenId == Workspace.FIRST_SCREEN_ID)
? 1 : 0;
ArrayList<DbEntry> items = loadWorkspaceEntries(screenId);
@@ -280,9 +283,11 @@
for (int y = mSrcY - 1; y >= startY; y--) {
// Use a deep copy when trying out a particular combination as it can change
// the underlying object.
- ArrayList<DbEntry> itemsOnScreen = tryRemove(x, y, startY, deepCopy(items), outLoss);
+ ArrayList<DbEntry> itemsOnScreen = tryRemove(x, y, startY, deepCopy(items),
+ outLoss);
- if ((outLoss[0] < removeWt) || ((outLoss[0] == removeWt) && (outLoss[1] < moveWt))) {
+ if ((outLoss[0] < removeWt) || ((outLoss[0] == removeWt) && (outLoss[1]
+ < moveWt))) {
removeWt = outLoss[0];
moveWt = outLoss[1];
removedCol = mShouldRemoveX ? x : removedCol;
@@ -363,6 +368,7 @@
/**
* Tries the remove the provided row and column.
+ *
* @param items all the items on the screen under operation
* @param outLoss array of size 2. The first entry is filled with weight loss, and the second
* with the overall item movement.
@@ -438,6 +444,7 @@
/**
* Recursively finds a placement for the provided items.
+ *
* @param index the position in {@link #itemsToPlace} to start looking at.
* @param weightLoss total weight loss upto this point
* @param moveCost total move cost upto this point
@@ -550,7 +557,8 @@
for (int x = 0; x < mTrgX; x++) {
if (!occupied.cells[x][y]) {
int dist = ignoreMove ? 0 :
- ((me.cellX - x) * (me.cellX - x) + (me.cellY - y) * (me.cellY - y));
+ ((me.cellX - x) * (me.cellX - x) + (me.cellY - y) * (me.cellY
+ - y));
if (dist < newDistance) {
newX = x;
newY = y;
@@ -815,7 +823,8 @@
public float weight;
- public DbEntry() { }
+ public DbEntry() {
+ }
public DbEntry copy() {
DbEntry entry = new DbEntry();
@@ -887,6 +896,7 @@
/**
* Migrates the workspace and hotseat in case their sizes changed.
+ *
* @return false if the migration failed.
*/
public static boolean migrateGridIfNeeded(Context context) {
@@ -896,7 +906,8 @@
String gridSizeString = getPointString(idp.numColumns, idp.numRows);
if (gridSizeString.equals(prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, "")) &&
- idp.numHotseatIcons == prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)) {
+ idp.numHotseatIcons == prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT,
+ idp.numHotseatIcons)) {
// Skip if workspace and hotseat sizes have not changed.
return true;
}
@@ -907,7 +918,8 @@
HashSet<String> validPackages = getValidPackages(context);
// Hotseat
- int srcHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons);
+ int srcHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT,
+ idp.numHotseatIcons);
if (srcHotseatCount != idp.numHotseatIcons) {
// Migrate hotseat.
@@ -920,7 +932,8 @@
Point sourceSize = parsePoint(prefs.getString(
KEY_MIGRATION_SRC_WORKSPACE_SIZE, gridSizeString));
- if (new MultiStepMigrationTask(validPackages, context).migrate(sourceSize, targetSize)) {
+ if (new MultiStepMigrationTask(validPackages, context).migrate(sourceSize,
+ targetSize)) {
dbChanged = true;
}
@@ -970,9 +983,11 @@
/**
* Removes any broken item from the hotseat.
+ *
* @return a map with occupied hotseat position set to non-null value.
*/
- public static IntSparseArrayMap<Object> removeBrokenHotseatItems(Context context) throws Exception {
+ public static IntSparseArrayMap<Object> removeBrokenHotseatItems(Context context)
+ throws Exception {
GridSizeMigrationTask task = new GridSizeMigrationTask(
context, LauncherAppState.getIDP(context), getValidPackages(context),
Integer.MAX_VALUE, Integer.MAX_VALUE);
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index bb3a760..94cf5c2 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -441,7 +441,7 @@
// Mark the first row as occupied (if the feature is enabled)
// in order to account for the QSB.
screen.markCells(0, 0, countX + 1, 1,
- FeatureFlags.getInstance(mContext).isQsbOnFirstScreenEnabled());
+ FeatureFlags.QSB_ON_FIRST_SCREEN.get());
}
occupied.put(item.screenId, screen);
}
diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index 68cf7de..f27b728 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -16,7 +16,7 @@
package com.android.launcher3.notification;
-import static com.android.launcher3.SettingsActivity.NOTIFICATION_BADGING;
+import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
import android.annotation.TargetApi;
import android.app.Notification;
@@ -28,14 +28,13 @@
import android.service.notification.NotificationListenerService;
import android.service.notification.StatusBarNotification;
import android.text.TextUtils;
-import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.util.IntSet;
import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.util.SettingsObserver;
+import com.android.launcher3.util.SecureSettingsObserver;
import java.util.ArrayList;
import java.util.Arrays;
@@ -43,7 +42,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import androidx.annotation.Nullable;
@@ -79,7 +77,7 @@
/** The last notification key that was dismissed from launcher UI */
private String mLastKeyDismissedByLauncher;
- private SettingsObserver mNotificationBadgingObserver;
+ private SecureSettingsObserver mNotificationBadgingObserver;
private final Handler.Callback mWorkerCallback = new Handler.Callback() {
@Override
@@ -196,19 +194,20 @@
super.onListenerConnected();
sIsConnected = true;
- mNotificationBadgingObserver = new SettingsObserver.Secure(getContentResolver()) {
- @Override
- public void onSettingChanged(boolean isNotificationBadgingEnabled) {
- if (!isNotificationBadgingEnabled && sIsConnected) {
- requestUnbind();
- }
- }
- };
- mNotificationBadgingObserver.register(NOTIFICATION_BADGING);
+ mNotificationBadgingObserver =
+ newNotificationSettingsObserver(this, this::onNotificationBadgingChanged);
+ mNotificationBadgingObserver.register();
+ mNotificationBadgingObserver.dispatchOnChange();
onNotificationFullRefresh();
}
+ private void onNotificationBadgingChanged(boolean isNotificationBadgingEnabled) {
+ if (!isNotificationBadgingEnabled && sIsConnected) {
+ requestUnbind();
+ }
+ }
+
private void onNotificationFullRefresh() {
mWorkerHandler.obtainMessage(MSG_NOTIFICATION_FULL_REFRESH).sendToTarget();
}
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 6877cc4..b9e6a98 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -391,13 +391,10 @@
if (view instanceof DeepShortcutView) {
// Expanded system shortcut, with both icon and text shown on white background.
final DeepShortcutView shortcutView = (DeepShortcutView) view;
- shortcutView.getIconView().setBackgroundResource(info.iconResId);
- shortcutView.getBubbleText().setText(info.labelResId);
+ info.setIconAndLabelFor(shortcutView.getIconView(), shortcutView.getBubbleText());
} else if (view instanceof ImageView) {
// Only the system shortcut icon shows on a gray background header.
- final ImageView shortcutIcon = (ImageView) view;
- shortcutIcon.setImageResource(info.iconResId);
- shortcutIcon.setContentDescription(getContext().getText(info.labelResId));
+ info.setIconAndContentDescriptionFor((ImageView) view);
}
view.setTag(info);
view.setOnClickListener(info.getOnClickListener(mLauncher,
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 693e532..b80ba8a 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -3,10 +3,15 @@
import static com.android.launcher3.userevent.nano.LauncherLogProto.Action;
import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
+import android.content.Context;
import android.content.Intent;
import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.ImageView;
+import android.widget.TextView;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.BaseDraggingActivity;
@@ -23,18 +28,82 @@
import java.util.List;
/**
- * Represents a system shortcut for a given app. The shortcut should have a static label and
- * icon, and an onClickListener that depends on the item that the shortcut services.
+ * Represents a system shortcut for a given app. The shortcut should have a label and icon, and an
+ * onClickListener that depends on the item that the shortcut services.
*
* Example system shortcuts, defined as inner classes, include Widgets and AppInfo.
*/
public abstract class SystemShortcut<T extends BaseDraggingActivity> extends ItemInfo {
- public final int iconResId;
- public final int labelResId;
+ private final int mIconResId;
+ private final int mLabelResId;
+ private final Drawable mIcon;
+ private final CharSequence mLabel;
+ private final CharSequence mContentDescription;
+ private final int mAccessibilityActionId;
public SystemShortcut(int iconResId, int labelResId) {
- this.iconResId = iconResId;
- this.labelResId = labelResId;
+ mIconResId = iconResId;
+ mLabelResId = labelResId;
+ mAccessibilityActionId = labelResId;
+ mIcon = null;
+ mLabel = null;
+ mContentDescription = null;
+ }
+
+ public SystemShortcut(Drawable icon, CharSequence label, CharSequence contentDescription,
+ int accessibilityActionId) {
+ mIcon = icon;
+ mLabel = label;
+ mContentDescription = contentDescription;
+ mAccessibilityActionId = accessibilityActionId;
+ mIconResId = 0;
+ mLabelResId = 0;
+ }
+
+ public SystemShortcut(SystemShortcut other) {
+ mIconResId = other.mIconResId;
+ mLabelResId = other.mLabelResId;
+ mIcon = other.mIcon;
+ mLabel = other.mLabel;
+ mContentDescription = other.mContentDescription;
+ mAccessibilityActionId = other.mAccessibilityActionId;
+ }
+
+ public void setIconAndLabelFor(View iconView, TextView labelView) {
+ if (mIcon != null) {
+ iconView.setBackground(mIcon);
+ } else {
+ iconView.setBackgroundResource(mIconResId);
+ }
+
+ if (mLabel != null) {
+ labelView.setText(mLabel);
+ } else {
+ labelView.setText(mLabelResId);
+ }
+ }
+
+ public void setIconAndContentDescriptionFor(ImageView view) {
+ if (mIcon != null) {
+ view.setImageDrawable(mIcon);
+ } else {
+ view.setImageResource(mIconResId);
+ }
+
+ view.setContentDescription(getContentDescription(view.getContext()));
+ }
+
+ private CharSequence getContentDescription(Context context) {
+ return mContentDescription != null ? mContentDescription : context.getText(mLabelResId);
+ }
+
+ public AccessibilityNodeInfo.AccessibilityAction createAccessibilityAction(Context context) {
+ return new AccessibilityNodeInfo.AccessibilityAction(mAccessibilityActionId,
+ getContentDescription(context));
+ }
+
+ public boolean hasHandlerForAction(int action) {
+ return mAccessibilityActionId == action;
}
public abstract View.OnClickListener getOnClickListener(T activity, ItemInfo itemInfo);
diff --git a/src/com/android/launcher3/provider/ImportDataTask.java b/src/com/android/launcher3/provider/ImportDataTask.java
index 4edd30f..e1b2698 100644
--- a/src/com/android/launcher3/provider/ImportDataTask.java
+++ b/src/com/android/launcher3/provider/ImportDataTask.java
@@ -136,7 +136,7 @@
.getSerialNumberForUser(Process.myUserHandle()));
boolean createEmptyRowOnFirstScreen;
- if (FeatureFlags.getInstance(mContext).isQsbOnFirstScreenEnabled()) {
+ if (FeatureFlags.QSB_ON_FIRST_SCREEN.get()) {
try (Cursor c = mContext.getContentResolver().query(mOtherFavoritesUri, null,
// get items on the first row of the first screen
"profileId = ? AND container = -100 AND screen = ? AND cellY = 0",
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index 82ab15c..ac1fafb 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -213,7 +213,7 @@
}
public boolean isQsbEnabled() {
- return FeatureFlags.getInstance(getContext()).isQsbOnFirstScreenEnabled();
+ return FeatureFlags.QSB_ON_FIRST_SCREEN.get();
}
protected Bundle createBindOptions() {
diff --git a/src/com/android/launcher3/util/MultiValueAlpha.java b/src/com/android/launcher3/util/MultiValueAlpha.java
index f810f48..07f835d 100644
--- a/src/com/android/launcher3/util/MultiValueAlpha.java
+++ b/src/com/android/launcher3/util/MultiValueAlpha.java
@@ -19,6 +19,8 @@
import android.util.Property;
import android.view.View;
+import java.util.Arrays;
+
/**
* Utility class to handle separating a single value as a factor of multiple values
*/
@@ -55,6 +57,11 @@
}
}
+ @Override
+ public String toString() {
+ return Arrays.toString(mMyProperties);
+ }
+
public AlphaProperty getProperty(int index) {
return mMyProperties[index];
}
@@ -97,5 +104,10 @@
public float getValue() {
return mValue;
}
+
+ @Override
+ public String toString() {
+ return Float.toString(mValue);
+ }
}
}
diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
new file mode 100644
index 0000000..48aa02b
--- /dev/null
+++ b/src/com/android/launcher3/util/SecureSettingsObserver.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.util;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.provider.Settings;
+
+/**
+ * Utility class to listen for secure settings changes
+ */
+public class SecureSettingsObserver extends ContentObserver {
+
+ /** Hidden field Settings.Secure.NOTIFICATION_BADGING */
+ public static final String NOTIFICATION_BADGING = "notification_badging";
+
+ private final ContentResolver mResolver;
+ private final String mKeySetting;
+ private final int mDefaultValue;
+ private final OnChangeListener mOnChangeListener;
+
+ public SecureSettingsObserver(ContentResolver resolver, OnChangeListener listener,
+ String keySetting, int defaultValue) {
+ super(new Handler());
+
+ mResolver = resolver;
+ mOnChangeListener = listener;
+ mKeySetting = keySetting;
+ mDefaultValue = defaultValue;
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ mOnChangeListener.onSettingsChanged(getValue());
+ }
+
+ public boolean getValue() {
+ return Settings.Secure.getInt(mResolver, mKeySetting, mDefaultValue) == 1;
+ }
+
+ public void register() {
+ mResolver.registerContentObserver(Settings.Secure.getUriFor(mKeySetting), false, this);
+ }
+
+ public ContentResolver getResolver() {
+ return mResolver;
+ }
+
+ public void dispatchOnChange() {
+ onChange(true);
+ }
+
+ public void unregister() {
+ mResolver.unregisterContentObserver(this);
+ }
+
+ public interface OnChangeListener {
+ void onSettingsChanged(boolean isEnabled);
+ }
+
+ public static SecureSettingsObserver newNotificationSettingsObserver(Context context,
+ OnChangeListener listener) {
+ return new SecureSettingsObserver(
+ context.getContentResolver(), listener, NOTIFICATION_BADGING, 1);
+ }
+}
diff --git a/src/com/android/launcher3/util/SettingsObserver.java b/src/com/android/launcher3/util/SettingsObserver.java
deleted file mode 100644
index 6baa242..0000000
--- a/src/com/android/launcher3/util/SettingsObserver.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-import android.content.ContentResolver;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.provider.Settings;
-
-public interface SettingsObserver {
-
- /**
- * Registers the content observer to call {@link #onSettingChanged(boolean)} when any of the
- * passed settings change. The value passed to onSettingChanged() is based on the key setting.
- */
- void register(String keySetting, String ... dependentSettings);
- void unregister();
- void onSettingChanged(boolean keySettingEnabled);
-
-
- abstract class Secure extends ContentObserver implements SettingsObserver {
- private ContentResolver mResolver;
- private String mKeySetting;
-
- public Secure(ContentResolver resolver) {
- super(new Handler());
- mResolver = resolver;
- }
-
- @Override
- public void register(String keySetting, String ... dependentSettings) {
- mKeySetting = keySetting;
- mResolver.registerContentObserver(
- Settings.Secure.getUriFor(mKeySetting), false, this);
- for (String setting : dependentSettings) {
- mResolver.registerContentObserver(
- Settings.Secure.getUriFor(setting), false, this);
- }
- onChange(true);
- }
-
- @Override
- public void unregister() {
- mResolver.unregisterContentObserver(this);
- }
-
- @Override
- public void onChange(boolean selfChange) {
- super.onChange(selfChange);
- onSettingChanged(Settings.Secure.getInt(mResolver, mKeySetting, 1) == 1);
- }
- }
-
- abstract class System extends ContentObserver implements SettingsObserver {
- private ContentResolver mResolver;
- private String mKeySetting;
-
- public System(ContentResolver resolver) {
- super(new Handler());
- mResolver = resolver;
- }
-
- @Override
- public void register(String keySetting, String ... dependentSettings) {
- mKeySetting = keySetting;
- mResolver.registerContentObserver(
- Settings.System.getUriFor(mKeySetting), false, this);
- for (String setting : dependentSettings) {
- mResolver.registerContentObserver(
- Settings.System.getUriFor(setting), false, this);
- }
- onChange(true);
- }
-
- @Override
- public void unregister() {
- mResolver.unregisterContentObserver(this);
- }
-
- @Override
- public void onChange(boolean selfChange) {
- super.onChange(selfChange);
- onSettingChanged(Settings.System.getInt(mResolver, mKeySetting, 1) == 1);
- }
- }
-}
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 5b8df13..4545a1e 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -39,6 +39,7 @@
import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
import com.android.launcher3.util.TouchController;
+import java.io.PrintWriter;
import java.util.ArrayList;
/**
@@ -357,6 +358,10 @@
return mMultiValueAlpha.getProperty(index);
}
+ public void dumpAlpha(PrintWriter writer) {
+ writer.println(" dragLayerAlpha : " + mMultiValueAlpha );
+ }
+
public static class LayoutParams extends InsettableFrameLayout.LayoutParams {
public int x, y;
public boolean customPosition = false;
diff --git a/src_flags/com/android/launcher3/config/FeatureFlags.java b/src_flags/com/android/launcher3/config/FeatureFlags.java
index f02f227..73c6996 100644
--- a/src_flags/com/android/launcher3/config/FeatureFlags.java
+++ b/src_flags/com/android/launcher3/config/FeatureFlags.java
@@ -22,11 +22,7 @@
* Defines a set of flags used to control various launcher behaviors
*/
public final class FeatureFlags extends BaseFlags {
- private static FeatureFlags instance = new FeatureFlags();
-
- public static FeatureFlags getInstance(Context context) {
- return instance;
+ private FeatureFlags() {
+ // Prevent instantiation
}
-
- private FeatureFlags() {}
}
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsRow.java b/src_plugins/com/android/systemui/plugins/AllAppsRow.java
new file mode 100644
index 0000000..c003fc1
--- /dev/null
+++ b/src_plugins/com/android/systemui/plugins/AllAppsRow.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.plugins;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.systemui.plugins.annotations.ProvidesInterface;
+
+/**
+ * Implement this plugin interface to add a row of views to the top of the all apps drawer.
+ */
+@ProvidesInterface(action = AllAppsRow.ACTION, version = AllAppsRow.VERSION)
+public interface AllAppsRow extends Plugin {
+ String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_ACTIONS";
+ int VERSION = 1;
+
+ /**
+ * Setup the row and return the parent view.
+ * @param parent The ViewGroup to which launcher will add this row.
+ */
+ View setup(ViewGroup parent);
+
+ /**
+ * @return The height to reserve in all apps for your views.
+ */
+ int getExpectedHeight();
+
+ /**
+ * Update launcher whenever {@link #getExpectedHeight()} changes.
+ */
+ void setOnHeightUpdatedListener(OnHeightUpdatedListener onHeightUpdatedListener);
+
+ interface OnHeightUpdatedListener {
+ void onHeightUpdated();
+ }
+}
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/src_ui_overrides/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
index fcb2abe..31dbb34 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
@@ -31,6 +31,10 @@
public void addPluginListener(PluginListener<? extends Plugin> listener, Class<?> pluginClass) {
}
+ public void addPluginListener(PluginListener<? extends Plugin> listener, Class<?> pluginClass,
+ boolean allowMultiple) {
+ }
+
public void removePluginListener(PluginListener<? extends Plugin> listener) {
}
}
diff --git a/tests/Android.mk b/tests/Android.mk
index 7cba33a..d808873 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -27,7 +27,8 @@
LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
../quickstep/src/com/android/quickstep/SwipeUpSetting.java \
- ../src/com/android/launcher3/TestProtocol.java
+ ../src/com/android/launcher3/util/SecureSettingsObserver.java \
+ ../src/com/android/launcher3/TestProtocol.java \
LOCAL_SDK_VERSION := current
LOCAL_MODULE := ub-launcher-aosp-tapl