Merge "Adding ability to load a search widget into Recents." (c74b3cb6) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetProviderInfo.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,12 @@ public class AppWidgetProviderInfo implements Parcelable {
		*/
		public static final int WIDGET_CATEGORY_KEYGUARD = 2;

		/**
		* Indicates that the widget can be displayed within recents.
		* @hide
		*/
		public static final int WIDGET_CATEGORY_RECENTS = 4;

		/**
		* Identity of this AppWidget component. This component should be a {@link
		* android.content.BroadcastReceiver}, and it will be sent the AppWidget intents

+3 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,9 @@
		<uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
		<uses-permission android:name="android.permission.TRUST_LISTENER" />

		<!-- Recents -->
		<uses-permission android:name="android.permission.BIND_APPWIDGET" />

		<!-- Wifi Display -->
		<uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />

+1 −4

Original line number	Diff line number	Diff line
		@@ -231,10 +231,7 @@
		<dimen name="recents_task_stack_scroll_dismiss_info_pane_distance">50dp</dimen>

		<!-- The height of the search bar space. -->
		<dimen name="recents_search_bar_space_height">40dp</dimen>

		<!-- The search bar edge margins. -->
		<dimen name="recents_search_bar_space_edge_margins">12dp</dimen>
		<dimen name="recents_search_bar_space_height">64dp</dimen>

		<!-- Used to calculate the translation animation duration, the expected amount of movement
		in dps over one second of time. -->

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class Console {
		public static final String AnsiRed = "\u001B[31m"; // SystemUIHandshake
		public static final String AnsiGreen = "\u001B[32m"; // MeasureAndLayout
		public static final String AnsiYellow = "\u001B[33m"; // SynchronizeViewsWithModel
		public static final String AnsiBlue = "\u001B[34m"; // TouchEvents
		public static final String AnsiBlue = "\u001B[34m"; // TouchEvents, Search
		public static final String AnsiPurple = "\u001B[35m"; // Draw
		public static final String AnsiCyan = "\u001B[36m"; // ClickEvents
		public static final String AnsiWhite = "\u001B[37m";

+6 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ public class Constants {
		public static final boolean EnableTaskStackClipping = false;
		public static final boolean EnableTaskBarThemeColors = true;
		public static final boolean EnableInfoPane = true;
		public static final boolean EnableSearchButton = false;
		public static final boolean EnableSearchButton = true;

		// This disables the bitmap and icon caches
		public static final boolean DisableBackgroundCache = false;
		@@ -52,6 +52,7 @@ public class Constants {
		public static final boolean SystemUIHandshake = false;
		public static final boolean TimeSystemCalls = false;
		public static final boolean Memory = false;
		public static final boolean Search = false;
		}

		public static class UI {
		@@ -72,6 +73,10 @@ public class Constants {
		}

		public static class Values {
		public static class App {
		public static int AppWidgetHostId = 1024;
		public static String Key_SearchAppWidgetId = "searchAppWidgetId";
		}
		public static class Window {
		// The dark background dim is set behind the empty recents view
		public static final float DarkBackgroundDim = 0.5f;