Merge "Fixed resolver list crash" into rvc-dev (54ee5697) · Commits · e / os / android_frameworks_base

core/res/res/layout-car/car_resolver_different_item_header.xml

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		* Copyright 2019, 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.
		*/
		-->
		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alwaysShow="true"
		android:text="@*android:string/use_a_different_app"
		android:minHeight="56dp"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:gravity="start\|center_vertical"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:elevation="8dp"
		/>
		No newline at end of file

core/res/res/layout-car/car_resolver_list.xml

+123 −71

Original line number	Diff line number	Diff line
		@@ -22,6 +22,15 @@
		android:layout_height="match_parent"
		android:id="@id/contentPanel">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:weightSum="5"
		android:layout_alwaysShow="true"
		android:orientation="vertical"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp">

		<LinearLayout
		android:id="@+id/button_bar"
		android:visibility="gone"
		@@ -34,9 +43,8 @@
		android:background="?attr/colorBackgroundFloating"
		android:orientation="horizontal"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingStart="12dp"
		android:weightSum="5"
		android:weightSum="4"
		android:paddingEnd="12dp"
		android:elevation="8dp">

		@@ -48,7 +56,7 @@
		android:paddingStart="8dp"
		android:paddingEnd="8dp"
		android:textSize="40sp"
		android:layout_weight="5"
		android:layout_weight="4"
		android:layout_gravity="left"
		android:visibility="gone"
		android:textColor="?attr/colorAccent"
		@@ -58,11 +66,11 @@
		android:id="@+id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minHeight="56dp"
		android:layout_gravity="left"
		android:layout_weight="3"
		android:paddingTop="8dp"
		android:layout_below="@id/profile_button"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:paddingBottom="8dp"/>

		<Button
		@@ -71,32 +79,74 @@
		android:layout_height="wrap_content"
		android:enabled="false"
		android:layout_gravity="right"
		style="?attr/buttonBarButtonStyle"
		android:text="@string/activity_resolver_use_once"
		android:layout_weight="1"
		android:layout_weight="0.5"
		android:onClick="onButtonClick"/>

		<Button
		android:id="@+id/button_always"
		android:layout_marginLeft="10dp"
		android:layout_marginLeft="2dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:enabled="false"
		android:layout_gravity="right"
		style="?attr/buttonBarButtonStyle"
		android:text="@string/activity_resolver_use_always"
		android:layout_weight="1"
		android:layout_weight="0.5"
		android:onClick="onButtonClick"/>
		</LinearLayout>

		<ListView
		<FrameLayout
		android:id="@+id/stub"
		android:visibility="gone"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?attr/colorBackgroundFloating"/>

		<TabHost
		android:id="@+id/profile_tabhost"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_centerHorizontal="true"
		android:background="?attr/colorBackgroundFloating">
		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TabWidget
		android:id="@android:id/tabs"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone">
		</TabWidget>
		<View
		android:id="@+id/resolver_tab_divider"
		android:visibility="gone"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/colorBackgroundFloating"
		android:foreground="?attr/dividerVertical"
		android:layout_marginBottom="8dp"/>
		<FrameLayout
		android:id="@android:id/tabcontent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<com.android.internal.app.ResolverViewPager
		android:id="@+id/profile_pager"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>
		</FrameLayout>
		</LinearLayout>
		</TabHost>

		<View
		android:layout_alwaysShow="true"
		android:layout_width="match_parent"
		android:layout_height="500dp"
		android:id="@+id/resolver_list"
		android:clipToPadding="false"
		android:scrollbarStyle="outsideOverlay"
		android:layout_height="1dp"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp"
		android:nestedScrollingEnabled="true"
		android:scrollIndicators="top\|bottom"/>
		android:foreground="?attr/dividerVertical"/>

		<TextView android:id="@+id/empty"
		android:layout_width="match_parent"
		@@ -109,4 +159,6 @@
		android:gravity="center"
		android:visibility="gone"/>

		</LinearLayout>

		</com.android.internal.widget.ResolverDrawerLayout>

core/res/res/layout-car/car_resolver_list_with_default.xml

+55 −20

Original line number	Diff line number	Diff line
		@@ -40,12 +40,12 @@

		<ImageView
		android:id="@+id/icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_width="60dp"
		android:layout_height="60dp"
		android:layout_gravity="start\|top"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="16dp"
		android:layout_marginTop="20dp"
		android:layout_marginStart="10dp"
		android:layout_marginEnd="5dp"
		android:layout_marginTop="10dp"
		android:src="@drawable/resolver_icon_placeholder"
		android:scaleType="fitCenter"/>

		@@ -55,7 +55,7 @@
		android:layout_weight="1"
		android:layout_height="?attr/listPreferredItemHeight"
		android:layout_marginStart="16dp"
		android:textAppearance="?attr/textAppearanceMedium"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:gravity="start\|center_vertical"
		android:paddingEnd="16dp"/>

		@@ -120,7 +120,7 @@
		android:layout_width="wrap_content"
		android:layout_gravity="start"
		android:maxLines="2"
		style="?attr/buttonBarNegativeButtonStyle"
		style="?attr/buttonBarButtonStyle"
		android:minHeight="@dimen/alert_dialog_button_bar_height"
		android:layout_height="wrap_content"
		android:enabled="false"
		@@ -133,29 +133,64 @@
		android:layout_gravity="end"
		android:maxLines="2"
		android:minHeight="@dimen/alert_dialog_button_bar_height"
		style="?attr/buttonBarPositiveButtonStyle"
		style="?attr/buttonBarButtonStyle"
		android:layout_height="wrap_content"
		android:enabled="false"
		android:text="@string/activity_resolver_use_always"
		android:onClick="onButtonClick"/>
		</LinearLayout>

		<View
		<FrameLayout
		android:id="@+id/stub"
		android:layout_alwaysShow="true"
		android:visibility="gone"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/dividerVertical"/>
		android:layout_height="wrap_content"
		android:background="?attr/colorBackgroundFloating"/>

		<ListView
		<TabHost
		android:layout_alwaysShow="true"
		android:id="@+id/profile_tabhost"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:id="@+id/resolver_list"
		android:layout_weight="4"
		android:clipToPadding="false"
		android:scrollbarStyle="outsideOverlay"
		android:layout_alignParentTop="true"
		android:layout_centerHorizontal="true"
		android:background="?attr/colorBackgroundFloating">
		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TabWidget
		android:id="@android:id/tabs"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone">
		</TabWidget>
		<View
		android:id="@+id/resolver_tab_divider"
		android:visibility="gone"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp"
		android:nestedScrollingEnabled="true"
		android:divider="@null"/>
		android:foreground="?attr/dividerVertical"
		android:layout_marginBottom="8dp"/>
		<FrameLayout
		android:id="@android:id/tabcontent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<com.android.internal.app.ResolverViewPager
		android:id="@+id/profile_pager"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		</com.android.internal.app.ResolverViewPager>
		</FrameLayout>
		</LinearLayout>
		</TabHost>

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

		</com.android.internal.widget.ResolverDrawerLayout>