Merge "Change display size preview for app icons." (c0e59a18) · Commits · e / os / android_packages_apps_Settings

res/layout/screen_zoom_preview_2.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,4 +17,7 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:padding="32dp"
		android:numColumns="3"
		android:gravity="center"
		android:importantForAccessibility="noHideDescendants" />

res/layout/screen_zoom_preview_app_icon.xml

+23 −28

Original line number	Diff line number	Diff line
		@@ -14,18 +14,14 @@
		limitations under the License.
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:importantForAccessibility="noHideDescendants">

		<LinearLayout
		android:layout_width="@dimen/screen_zoom_preview_app_icon_width"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|top"
		android:gravity="center_horizontal"
		android:orientation="vertical"
		android:padding="8dp">
		android:paddingTop="8dp">

		<ImageView
		android:id="@android:id/icon1"
		@@ -43,4 +39,3 @@
		android:singleLine="true"
		android:textAppearance="@android:style/TextAppearance.Material.Caption" />
		</LinearLayout>
		No newline at end of file
		</FrameLayout>
		No newline at end of file

res/values/dimens.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -251,7 +251,6 @@
		<dimen name="unmount_button_padding">8dp</dimen>

		<!-- Display, Screen zoom -->
		<dimen name="screen_zoom_preview_app_icon_width">88dp</dimen>
		<dimen name="conversation_message_list_padding">10dp</dimen>
		<dimen name="conversation_message_contact_icon_text_size">32sp</dimen>
		<dimen name="conversation_message_text_size">16sp</dimen>

src/com/android/settings/display/AppGridView.java

+15 −8

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.graphics.drawable.Drawable;
		import android.os.UserHandle;
		import androidx.annotation.VisibleForTesting;
		import android.util.AttributeSet;
		import android.util.IconDrawableFactory;
		import android.view.View;
		@@ -37,28 +36,32 @@ import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;

		import androidx.annotation.VisibleForTesting;

		public class AppGridView extends GridView {
		public AppGridView(Context context) {
		this(context, null);
		super(context);
		init(context);
		}

		public AppGridView(Context context, AttributeSet attrs) {
		this(context, attrs, 0);
		super(context, attrs);
		init(context);
		}

		public AppGridView(Context context, AttributeSet attrs, int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0);
		super(context, attrs, defStyleAttr);
		init(context);
		}

		public AppGridView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleResId) {
		super(context, attrs, defStyleAttr, defStyleResId);

		setNumColumns(AUTO_FIT);
		init(context);

		final int columnWidth = getResources().getDimensionPixelSize(
		R.dimen.screen_zoom_preview_app_icon_width);
		setColumnWidth(columnWidth);
		}

		private void init(Context context) {
		setAdapter(new AppsAdapter(context, R.layout.screen_zoom_preview_app_icon,
		android.R.id.text1, android.R.id.icon1));
		}
		@@ -105,6 +108,7 @@ public class AppGridView extends GridView {
		}

		private void loadAllApps() {
		final int needAppCount = 6;
		final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
		mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);

		@@ -117,6 +121,9 @@ public class AppGridView extends GridView {
		if (label != null) {
		results.add(new ActivityEntry(info, label.toString(), iconFactory));
		}
		if (results.size() >= needAppCount) {
		break;
		}
		}

		Collections.sort(results);