Merge "Resolver: Modernize layout" into qt-qpr1-dev (a17cb6e1) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+27 −19

Original line number	Diff line number	Diff line
		@@ -388,13 +388,8 @@ public class ResolverActivity extends Activity {
		mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
		mSystemWindowInsets.right, 0);

		View emptyView = findViewById(R.id.empty);
		if (emptyView != null) {
		emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom
		+ getResources().getDimensionPixelSize(
		R.dimen.chooser_edge_margin_normal) * 2);
		}

		// Need extra padding so the list can fully scroll up
		if (useLayoutWithDefault()) {
		if (mFooterSpacer == null) {
		mFooterSpacer = new Space(getApplicationContext());
		} else {
		@@ -403,6 +398,14 @@ public class ResolverActivity extends Activity {
		mFooterSpacer.setLayoutParams(new AbsListView.LayoutParams(LayoutParams.MATCH_PARENT,
		mSystemWindowInsets.bottom));
		((ListView) mAdapterView).addFooterView(mFooterSpacer);
		} else {
		View emptyView = findViewById(R.id.empty);
		if (emptyView != null) {
		emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom
		+ getResources().getDimensionPixelSize(
		R.dimen.chooser_edge_margin_normal) * 2);
		}
		}

		resetButtonBar();

		@@ -1304,6 +1307,7 @@ public class ResolverActivity extends Activity {
		// In case this method is called again (due to activity recreation), avoid adding a new
		// header if one is already present.
		if (useHeader && listView != null && listView.getHeaderViewsCount() == 0) {
		listView.setHeaderDividersEnabled(true);
		listView.addHeaderView(LayoutInflater.from(this).inflate(
		R.layout.resolver_different_item_header, listView, false));
		}
		@@ -1346,11 +1350,13 @@ public class ResolverActivity extends Activity {
		final ViewGroup buttonLayout = findViewById(R.id.button_bar);
		if (buttonLayout != null) {
		buttonLayout.setVisibility(View.VISIBLE);

		if (!useLayoutWithDefault()) {
		int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;
		buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(),
		buttonLayout.getPaddingRight(), getResources().getDimensionPixelSize(
		R.dimen.resolver_button_bar_spacing) + inset);

		}
		mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once);
		mAlwaysButton = (Button) buttonLayout.findViewById(R.id.button_always);

		@@ -2057,7 +2063,9 @@ public class ResolverActivity extends Activity {
		CharSequence subLabel = info.getExtendedInfo();
		if (TextUtils.equals(label, subLabel)) subLabel = null;

		if (!TextUtils.equals(holder.text2.getText(), subLabel)) {
		if (!TextUtils.equals(holder.text2.getText(), subLabel)
		&& !TextUtils.isEmpty(subLabel)) {
		holder.text2.setVisibility(View.VISIBLE);
		holder.text2.setText(subLabel);
		}

core/res/res/layout/resolve_list_item.xml

+12 −8

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:minHeight="?attr/listPreferredItemHeightSmall"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		android:background="?attr/activatedBackgroundIndicator">

		<!-- Activity icon when presenting dialog
		@@ -32,7 +30,8 @@
		android:layout_width="@dimen/resolver_icon_size"
		android:layout_height="@dimen/resolver_icon_size"
		android:layout_gravity="start\|center_vertical"
		android:layout_marginStart="?attr/listPreferredItemPaddingStart"
		android:layout_marginStart="@dimen/resolver_icon_margin"
		android:layout_marginEnd="@dimen/resolver_icon_margin"
		android:layout_marginTop="12dp"
		android:layout_marginBottom="12dp"
		android:scaleType="fitCenter" />
		@@ -40,8 +39,7 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:gravity="start\|center_vertical"
		android:orientation="vertical"
		android:paddingStart="?attr/listPreferredItemPaddingStart"
		android:paddingEnd="?attr/listPreferredItemPaddingEnd"
		android:paddingEnd="@dimen/resolver_edge_margin"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="start\|center_vertical">
		@@ -49,14 +47,20 @@
		<TextView android:id="@android:id/text1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?attr/textAppearanceMedium"
		android:textColor="?attr/textColorPrimary"
		android:layout_gravity="start\|center_vertical"
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="@android:string/config_bodyFontFamily"
		android:textSize="16sp"
		android:minLines="1"
		android:maxLines="1"
		android:ellipsize="marquee" />
		<!-- Extended activity info to distinguish between duplicate activity names -->
		<TextView android:id="@android:id/text2"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:fontFamily="@android:string/config_bodyFontFamily"
		android:layout_gravity="start\|center_vertical"
		android:textSize="14sp"
		android:visibility="gone"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minLines="1"

core/res/res/layout/resolver_different_item_header.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -22,12 +22,12 @@
		android:layout_height="wrap_content"
		android:layout_alwaysShow="true"
		android:text="@string/use_a_different_app"
		android:minHeight="56dp"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:textSize="16sp"
		android:gravity="start\|center_vertical"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:elevation="8dp"
		/>
		android:paddingStart="@dimen/resolver_edge_margin"
		android:paddingEnd="@dimen/resolver_edge_margin"
		android:paddingTop="@dimen/resolver_small_margin"
		android:paddingBottom="@dimen/resolver_edge_margin"
		android:elevation="1dp" />

core/res/res/layout/resolver_list.xml

+40 −23

Original line number	Diff line number	Diff line
		@@ -29,16 +29,18 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alwaysShow="true"
		android:elevation="8dp"
		android:background="?attr/colorBackgroundFloating">
		android:elevation="@dimen/resolver_elevation"
		android:paddingTop="@dimen/resolver_small_margin"
		android:paddingStart="@dimen/resolver_edge_margin"
		android:paddingEnd="@dimen/resolver_edge_margin"
		android:paddingBottom="@dimen/resolver_edge_margin"
		android:background="@drawable/bottomsheet_background">

		<TextView
		android:id="@+id/profile_button"
		android:layout_width="wrap_content"
		android:layout_height="48dp"
		android:layout_marginEnd="8dp"
		android:paddingStart="8dp"
		android:paddingEnd="8dp"
		android:visibility="gone"
		style="?attr/borderlessButtonStyle"
		android:textAppearance="?attr/textAppearanceButton"
		@@ -50,36 +52,49 @@

		<TextView
		android:id="@+id/title"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="56dp"
		android:textAppearance="?attr/textAppearanceMedium"
		android:gravity="start\|center_vertical"
		android:paddingStart="?attr/dialogPreferredPadding"
		android:paddingEnd="?attr/dialogPreferredPadding"
		android:paddingTop="8dp"
		android:layout_below="@id/profile_button"
		android:layout_alignParentStart="true"
		android:paddingBottom="8dp" />
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:textSize="16sp"
		android:gravity="start\|center_vertical" />
		</RelativeLayout>

		<View
		android:layout_alwaysShow="true"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/colorBackgroundFloating"
		android:foreground="?attr/dividerVertical" />
		<ListView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:id="@+id/resolver_list"
		android:clipToPadding="false"
		android:scrollbarStyle="outsideOverlay"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp"
		android:elevation="@dimen/resolver_elevation"
		android:nestedScrollingEnabled="true"
		android:scrollbarStyle="outsideOverlay"
		android:scrollIndicators="top\|bottom"
		android:divider="@null" />
		android:divider="?attr/dividerVertical"
		android:footerDividersEnabled="false"
		android:headerDividersEnabled="false"
		android:dividerHeight="1dp" />
		<View
		android:layout_alwaysShow="true"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/colorBackgroundFloating"
		android:foreground="?attr/dividerVertical" />


		<TextView android:id="@+id/empty"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp"
		android:elevation="@dimen/resolver_elevation"
		android:layout_alwaysShow="true"
		android:text="@string/noApplications"
		android:padding="32dp"
		@@ -102,18 +117,19 @@
		android:background="?attr/colorBackgroundFloating"
		android:paddingTop="@dimen/resolver_button_bar_spacing"
		android:paddingBottom="@dimen/resolver_button_bar_spacing"
		android:paddingStart="12dp"
		android:paddingEnd="12dp"
		android:elevation="8dp">
		android:paddingStart="@dimen/resolver_edge_margin"
		android:paddingEnd="@dimen/resolver_small_margin"
		android:elevation="@dimen/resolver_elevation">

		<Button
		android:id="@+id/button_once"
		android:layout_width="wrap_content"
		android:layout_gravity="start"
		android:maxLines="2"
		style="?attr/buttonBarNegativeButtonStyle"
		android:minHeight="@dimen/alert_dialog_button_bar_height"
		style="?attr/buttonBarButtonStyle"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:layout_height="wrap_content"
		android:textAllCaps="false"
		android:enabled="false"
		android:text="@string/activity_resolver_use_once"
		android:onClick="onButtonClick" />
		@@ -123,8 +139,9 @@
		android:layout_width="wrap_content"
		android:layout_gravity="end"
		android:maxLines="2"
		android:minHeight="@dimen/alert_dialog_button_bar_height"
		style="?attr/buttonBarPositiveButtonStyle"
		style="?attr/buttonBarButtonStyle"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:textAllCaps="false"
		android:layout_height="wrap_content"
		android:enabled="false"
		android:text="@string/activity_resolver_use_always"

core/res/res/layout/resolver_list_with_default.xml

+45 −31

Original line number	Diff line number	Diff line
		@@ -29,22 +29,22 @@
		android:layout_height="wrap_content"
		android:layout_alwaysShow="true"
		android:orientation="vertical"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp">
		android:background="@drawable/bottomsheet_background"
		android:paddingTop="@dimen/resolver_small_margin"
		android:elevation="@dimen/resolver_elevation">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="64dp"
		android:orientation="horizontal">

		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingBottom="@dimen/resolver_edge_margin"
		android:paddingEnd="@dimen/resolver_edge_margin">
		<ImageView
		android:id="@+id/icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_width="@dimen/resolver_icon_size"
		android:layout_height="@dimen/resolver_icon_size"
		android:layout_gravity="start\|top"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="16dp"
		android:layout_marginTop="20dp"
		android:layout_marginStart="@dimen/resolver_icon_margin"
		android:src="@drawable/resolver_icon_placeholder"
		android:scaleType="fitCenter" />

		@@ -52,9 +52,11 @@
		android:id="@+id/title"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="?attr/listPreferredItemHeight"
		android:layout_marginStart="16dp"
		android:textAppearance="?attr/textAppearanceMedium"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/resolver_icon_margin"
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:textSize="16sp"
		android:gravity="start\|center_vertical"
		android:paddingEnd="16dp" />

		@@ -107,21 +109,22 @@
		android:orientation="horizontal"
		android:layoutDirection="locale"
		android:measureWithLargestChild="true"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingStart="12dp"
		android:paddingEnd="12dp"
		android:elevation="8dp">
		android:paddingTop="@dimen/resolver_button_bar_spacing"
		android:paddingBottom="@dimen/resolver_button_bar_spacing"
		android:paddingStart="@dimen/resolver_edge_margin"
		android:paddingEnd="@dimen/resolver_small_margin"
		android:elevation="@dimen/resolver_elevation">

		<Button
		android:id="@+id/button_once"
		android:layout_width="wrap_content"
		android:layout_gravity="start"
		android:maxLines="2"
		style="?attr/buttonBarNegativeButtonStyle"
		android:minHeight="@dimen/alert_dialog_button_bar_height"
		style="?attr/buttonBarButtonStyle"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:layout_height="wrap_content"
		android:enabled="false"
		android:textAllCaps="false"
		android:text="@string/activity_resolver_use_once"
		android:onClick="onButtonClick" />

		@@ -130,29 +133,40 @@
		android:layout_width="wrap_content"
		android:layout_gravity="end"
		android:maxLines="2"
		android:minHeight="@dimen/alert_dialog_button_bar_height"
		style="?attr/buttonBarPositiveButtonStyle"
		style="?attr/buttonBarButtonStyle"
		android:fontFamily="@android:string/config_headlineFontFamilyMedium"
		android:layout_height="wrap_content"
		android:enabled="false"
		android:textAllCaps="false"
		android:text="@string/activity_resolver_use_always"
		android:onClick="onButtonClick" />
		</LinearLayout>
		</LinearLayout>

		<View
		android:layout_alwaysShow="true"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/dividerVertical" />
		</LinearLayout>

		android:background="?attr/colorBackgroundFloating"
		android:foreground="?attr/dividerVertical" />
		<ListView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:id="@+id/resolver_list"
		android:clipToPadding="false"
		android:scrollbarStyle="outsideOverlay"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp"
		android:elevation="@dimen/resolver_elevation"
		android:nestedScrollingEnabled="true"
		android:divider="@null" />

		android:scrollbarStyle="outsideOverlay"
		android:scrollIndicators="top\|bottom"
		android:divider="?attr/dividerVertical"
		android:footerDividersEnabled="false"
		android:headerDividersEnabled="false"
		android:dividerHeight="1dp" />
		<View
		android:layout_alwaysShow="true"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/colorBackgroundFloating"
		android:foreground="?attr/dividerVertical" />
		</com.android.internal.widget.ResolverDrawerLayout>