Merge "Progressive disclosure on selected UIs: app, display" (3d8a97fc) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_arrow_down_24dp.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- 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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorAccent">
		<path
		android:fillColor="#FF000000"
		android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
		</vector>

res/layout/expand_preference.xml

+53 −8

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

		<!-- Based off frameworks/base/core/res/res/layout/preference_material.xml -->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@drawable/selectable_card_grey"
		android:gravity="center_vertical"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:orientation="vertical"
		android:paddingEnd="?android:attr/scrollbarSize">
		android:gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:background="?android:attr/selectableItemBackground"
		android:clipToPadding="false">

		<LinearLayout
		android:id="@+id/icon_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="60dp"
		android:gravity="start\|center_vertical"
		android:orientation="horizontal"
		android:paddingEnd="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp">
		<com.android.internal.widget.PreferenceImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxWidth="48dp"
		android:maxHeight="48dp"/>
		</LinearLayout>

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"/>
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:textColor="?android:attr/colorAccent"
		android:ellipsize="marquee"/>

		<TextView
		android:id="@android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceListItemSecondary"
		android:textColor="?android:attr/textColorSecondary"
		android:ellipsize="marquee"
		android:maxLines="1"/>

		</RelativeLayout>

		</LinearLayout>

res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -6629,7 +6629,7 @@
		<string name="experimental_preference">(Experimental)</string>

		<!-- [CHAR LIMIT=45] Auto-rotate setting title -->
		<string name="display_auto_rotate_title">When device is rotated</string>
		<string name="display_auto_rotate_title">Device rotation</string>
		<!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
		<string name="display_auto_rotate_rotate">Rotate the contents of the screen</string>
		<!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->

src/com/android/settings/DisplaySettings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,12 @@ public class DisplaySettings extends DashboardFragment {
		return TAG;
		}

		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		mProgressiveDisclosureMixin.setTileLimit(4);
		}

		@Override
		protected String getCategoryKey() {
		return CategoryKey.CATEGORY_DISPLAY;

src/com/android/settings/applications/AdvancedAppSettings.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		package com.android.settings.applications;

		import android.content.Context;
		import android.os.Bundle;
		import android.provider.SearchIndexableResource;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		@@ -36,11 +35,6 @@ public class AdvancedAppSettings extends DashboardFragment {

		static final String TAG = "AdvancedAppSettings";

		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		}

		@Override
		protected String getCategoryKey() {
		return CategoryKey.CATEGORY_APPS_DEFAULT;