SystemUI : Move navring app loading to background tasks (9b762928) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/cm/NavigationRingConstants.java→core/java/com/android/internal/util/cm/NavigationRingConstants.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -15,10 +15,12 @@
		* limitations under the License.
		*/

		package com.android.systemui.cm;
		package com.android.internal.util.cm;

		public class NavigationRingConstants {
		public static final String BROADCAST = "android.intent.action.NAVBAR_RING_EDIT";
		public static final String EDIT_STATE_EXTRA = "edit_state_extra";

		public static final String ACTION_APP = "app";
		public static final String ACTION_ASSIST = "assist";
		public static final String ACTION_BACK = "back";

packages/SystemUI/AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,9 @@
		<!-- blur surface -->
		<uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />

		<!-- Action target -->
		<uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />

		<application
		android:name=".SystemUIApplication"
		android:persistent="true"

packages/SystemUI/res/layout/pick_item.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:gravity="center_vertical"
		android:drawablePadding="8dip"
		android:paddingTop="5dp"
		android:paddingBottom="5dp"
		android:drawablePadding="25dip"
		android:paddingStart="11dip"
		android:paddingEnd="11dip" />

packages/SystemUI/src/com/android/systemui/SearchPanelView.java

+18 −7

Original line number	Diff line number	Diff line
		@@ -58,9 +58,7 @@ import com.android.systemui.statusbar.phone.PhoneStatusBar;
		import java.util.ArrayList;
		import java.util.List;

		import static com.android.systemui.cm.NavigationRingConstants.ACTION_ASSIST;
		import static com.android.systemui.cm.NavigationRingConstants.ACTION_NONE;
		import static com.android.systemui.cm.NavigationRingConstants.BROADCAST;
		import static com.android.internal.util.cm.NavigationRingConstants.*;

		public class SearchPanelView extends FrameLayout implements StatusBarPanel,
		View.OnClickListener, ShortcutPickHelper.OnPickListener {
		@@ -411,6 +409,7 @@ public class SearchPanelView extends FrameLayout implements StatusBarPanel,
		show(false, true);
		startEditAnimation(false);
		updateTargetVisibility();
		mPicker.cleanup();
		} else if (v == mLogo \|\| v == mLogoLeft \|\| v == mLogoRight) {
		mSelectedView = (ImageView) v;
		mPicker.pickShortcut(v != mLogo);
		@@ -484,10 +483,18 @@ public class SearchPanelView extends FrameLayout implements StatusBarPanel,
		private BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		mInEditMode = true;
		boolean editMode = intent.getBooleanExtra(EDIT_STATE_EXTRA, false);
		if (editMode == mInEditMode) {
		return;
		}
		mInEditMode = editMode;
		if (mInEditMode) {
		show(true, true);
		startEditAnimation(true);
		updateTargetVisibility();
		} else {
		mEditButton.performClick();
		}
		}
		};

		@@ -526,4 +533,8 @@ public class SearchPanelView extends FrameLayout implements StatusBarPanel,
		}
		}

		@Override
		protected void onDetachedFromWindow() {
		mPicker.cleanup();
		}
		}

packages/SystemUI/src/com/android/systemui/cm/ActionTarget.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -18,10 +18,7 @@
		package com.android.systemui.cm;

		import android.app.ActivityManager;
		import android.app.ActivityManagerNative;
		import android.app.ActivityOptions;
		import android.app.KeyguardManager;
		import android.app.SearchManager;
		import android.content.ActivityNotFoundException;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -51,9 +48,8 @@ import android.view.WindowManagerGlobal;
		import android.widget.Toast;

		import com.android.internal.statusbar.IStatusBarService;
		import static com.android.systemui.cm.NavigationRingConstants.*;
		import static com.android.internal.util.cm.NavigationRingConstants.*;
		import com.android.systemui.screenshot.TakeScreenshotService;
		import com.android.systemui.statusbar.phone.KeyguardTouchDelegate;

		import java.net.URISyntaxException;