Merge branch 'ub-launcher3-dorval-polish2' (850a7b10) · Commits · e / os / android_packages_apps_Trebuchet

AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@
		android:launchMode="singleTask"
		android:clearTaskOnLaunch="true"
		android:stateNotNeeded="true"
		android:windowSoftInputMode="adjustPan\|stateUnchanged"
		android:windowSoftInputMode="adjustPan"
		android:screenOrientation="nosensor"
		android:configChanges="keyboard\|keyboardHidden\|navigation"
		android:resizeableActivity="true"

res/layout/search_container_all_apps.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,11 @@
		android:layout_width="match_parent"
		android:layout_height="@dimen/all_apps_search_bar_height"
		android:layout_gravity="center\|top"
		android:layout_marginBottom="-8dp"
		android:gravity="center\|bottom"
		android:saveEnabled="false"
		android:paddingLeft="@dimen/dynamic_grid_edge_margin"
		android:paddingRight="@dimen/dynamic_grid_edge_margin"
		android:layout_marginBottom="-8dp" >
		android:saveEnabled="false" >

		<!--
		Note: The following relation should always be true so that the shadows are aligned properly
		@@ -45,6 +45,7 @@
		android:imeOptions="actionSearch\|flagNoExtractUi"
		android:inputType="text\|textNoSuggestions\|textCapWords"
		android:maxLines="1"
		android:saveEnabled="false"
		android:scrollHorizontally="true"
		android:singleLine="true"
		android:textColor="?android:attr/textColorSecondary"

res/values/attrs.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,7 @@
		<attr name="iconTextSize" format="float" />

		<attr name="defaultLayoutId" format="reference" />
		<attr name="demoModeLayoutId" format="reference" />
		</declare-styleable>

		<declare-styleable name="CellLayout">

src/com/android/launcher3/AppInfo.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.launcher3;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.LauncherActivityInfo;
		import android.os.UserHandle;

		@@ -31,6 +32,10 @@ import com.android.launcher3.util.PackageManagerHelper;
		*/
		public class AppInfo extends ItemInfoWithIcon {

		public static final int FLAG_SYSTEM_UNKNOWN = 0;
		public static final int FLAG_SYSTEM_YES = 1 << 0;
		public static final int FLAG_SYSTEM_NO = 1 << 1;

		/**
		* The intent used to start the application.
		*/
		@@ -43,6 +48,11 @@ public class AppInfo extends ItemInfoWithIcon {
		*/
		public int isDisabled = ShortcutInfo.DEFAULT;

		/**
		* Stores if the app is a system app or not.
		*/
		public int isSystemApp;

		public AppInfo() {
		itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
		}
		@@ -71,6 +81,10 @@ public class AppInfo extends ItemInfoWithIcon {
		}

		intent = makeLaunchIntent(info);

		isSystemApp = (info.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 0
		? FLAG_SYSTEM_NO : FLAG_SYSTEM_YES;

		}

		public AppInfo(AppInfo info) {
		@@ -79,6 +93,7 @@ public class AppInfo extends ItemInfoWithIcon {
		title = Utilities.trim(info.title);
		intent = new Intent(info.intent);
		isDisabled = info.isDisabled;
		isSystemApp = info.isSystemApp;
		}

		@Override

src/com/android/launcher3/InvariantDeviceProfile.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -85,7 +85,9 @@ public class InvariantDeviceProfile {
		* Number of icons inside the hotseat area.
		*/
		public int numHotseatIcons;

		int defaultLayoutId;
		int demoModeLayoutId;

		public DeviceProfile landscapeProfile;
		public DeviceProfile portraitProfile;
		@@ -99,11 +101,11 @@ public class InvariantDeviceProfile {
		this(p.name, p.minWidthDps, p.minHeightDps, p.numRows, p.numColumns,
		p.numFolderRows, p.numFolderColumns, p.minAllAppsPredictionColumns,
		p.iconSize, p.landscapeIconSize, p.iconTextSize, p.numHotseatIcons,
		p.defaultLayoutId);
		p.defaultLayoutId, p.demoModeLayoutId);
		}

		InvariantDeviceProfile(String n, float w, float h, int r, int c, int fr, int fc, int maapc,
		float is, float lis, float its, int hs, int dlId) {
		float is, float lis, float its, int hs, int dlId, int dmlId) {
		name = n;
		minWidthDps = w;
		minHeightDps = h;
		@@ -117,6 +119,7 @@ public class InvariantDeviceProfile {
		iconTextSize = its;
		numHotseatIcons = hs;
		defaultLayoutId = dlId;
		demoModeLayoutId = dmlId;
		}

		@TargetApi(23)
		@@ -144,6 +147,7 @@ public class InvariantDeviceProfile {
		numColumns = closestProfile.numColumns;
		numHotseatIcons = closestProfile.numHotseatIcons;
		defaultLayoutId = closestProfile.defaultLayoutId;
		demoModeLayoutId = closestProfile.demoModeLayoutId;
		numFolderRows = closestProfile.numFolderRows;
		numFolderColumns = closestProfile.numFolderColumns;
		minAllAppsPredictionColumns = closestProfile.minAllAppsPredictionColumns;
		@@ -208,7 +212,8 @@ public class InvariantDeviceProfile {
		a.getFloat(R.styleable.InvariantDeviceProfile_landscapeIconSize, iconSize),
		a.getFloat(R.styleable.InvariantDeviceProfile_iconTextSize, 0),
		a.getInt(R.styleable.InvariantDeviceProfile_numHotseatIcons, numColumns),
		a.getResourceId(R.styleable.InvariantDeviceProfile_defaultLayoutId, 0)));
		a.getResourceId(R.styleable.InvariantDeviceProfile_defaultLayoutId, 0),
		a.getResourceId(R.styleable.InvariantDeviceProfile_demoModeLayoutId, 0)));
		a.recycle();
		}
		}