Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed resolver list crash" into rvc-dev am: 54ee569768 am: b54a4214af

Browse Source 
Change-Id: I2fec2753bb45ac685f19ceb44842ec15a4ddc1bf
This commit is contained in:
Automerger Merge Worker
2020-03-12 18:35:17 +00:00
parent 0ef697fc3d b54a4214af
commit 243a296e73
3 changed files with 181 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/res/res/layout-car/car_resolver_different_item_header.xml
View File

@@ -1,33 +0,0 @@
<?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"
/>

200
core/res/res/layout-car/car_resolver_list.xml
View File

@@ -23,90 +23,142 @@
android:id="@id/contentPanel"> android:id="@id/contentPanel">
<LinearLayout <LinearLayout
android:id="@+id/button_bar"
android:visibility="gone"
style="?attr/buttonBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_ignoreOffset="true"
android:layout_alwaysShow="true"
android:layout_hasNestedScrollIndicator="true"
android:background="?attr/colorBackgroundFloating"
android:orientation="horizontal"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="12dp"
android:weightSum="5" android:weightSum="5"
android:paddingEnd="12dp" android:layout_alwaysShow="true"
android:orientation="vertical"
android:background="?attr/colorBackgroundFloating"
android:elevation="8dp"> android:elevation="8dp">
<TextView <LinearLayout
android:id="@+id/profile_button" android:id="@+id/button_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textSize="40sp"
android:layout_weight="5"
android:layout_gravity = "left"
android:visibility="gone" android:visibility="gone"
android:textColor="?attr/colorAccent" style="?attr/buttonBarStyle"
android:singleLine="true"/> android:layout_width="match_parent"
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="56dp" android:layout_ignoreOffset="true"
android:layout_gravity = "left" android:layout_alwaysShow="true"
android:layout_weight="3" android:layout_hasNestedScrollIndicator="true"
android:background="?attr/colorBackgroundFloating"
android:orientation="horizontal"
android:paddingTop="8dp" android:paddingTop="8dp"
android:layout_below="@id/profile_button" android:paddingStart="12dp"
android:paddingBottom="8dp"/> android:weightSum="4"
android:paddingEnd="12dp"
android:elevation="8dp">
<Button <TextView
android:id="@+id/button_once" android:id="@+id/profile_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:layout_marginEnd="8dp"
android:layout_gravity = "right" android:paddingStart="8dp"
android:text="@string/activity_resolver_use_once" android:paddingEnd="8dp"
android:layout_weight="1" android:textSize="40sp"
android:onClick="onButtonClick"/> android:layout_weight="4"
android:layout_gravity="left"
android:visibility="gone"
android:textColor="?attr/colorAccent"
android:singleLine="true"/>
<Button <TextView
android:id="@+id/button_always" android:id="@+id/title"
android:layout_marginLeft="10dp" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
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
android:id="@+id/button_once"
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_once"
android:layout_weight="0.5"
android:onClick="onButtonClick"/>
<Button
android:id="@+id/button_always"
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="0.5"
android:onClick="onButtonClick"/>
</LinearLayout>
<FrameLayout
android:id="@+id/stub"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:background="?attr/colorBackgroundFloating"/>
android:layout_gravity = "right"
android:text="@string/activity_resolver_use_always" <TabHost
android:layout_weight="1" android:id="@+id/profile_tabhost"
android:onClick="onButtonClick"/> 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="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:layout_alwaysShow="true"
android:text="@string/noApplications"
android:padding="32dp"
android:gravity="center"
android:visibility="gone"/>
</LinearLayout> </LinearLayout>
<ListView
android:layout_width="match_parent"
android:layout_height="500dp"
android:id="@+id/resolver_list"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"
android:background="?attr/colorBackgroundFloating"
android:elevation="8dp"
android:nestedScrollingEnabled="true"
android:scrollIndicators="top|bottom"/>
<TextView android:id="@+id/empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorBackgroundFloating"
android:elevation="8dp"
android:layout_alwaysShow="true"
android:text="@string/noApplications"
android:padding="32dp"
android:gravity="center"
android:visibility="gone"/>
</com.android.internal.widget.ResolverDrawerLayout> </com.android.internal.widget.ResolverDrawerLayout>

75
core/res/res/layout-car/car_resolver_list_with_default.xml
View File

@@ -40,12 +40,12 @@
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="24dp" android:layout_width="60dp"
android:layout_height="24dp" android:layout_height="60dp"
android:layout_gravity="start|top" android:layout_gravity="start|top"
android:layout_marginStart="16dp" android:layout_marginStart="10dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="5dp"
android:layout_marginTop="20dp" android:layout_marginTop="10dp"
android:src="@drawable/resolver_icon_placeholder" android:src="@drawable/resolver_icon_placeholder"
android:scaleType="fitCenter"/> android:scaleType="fitCenter"/>
@@ -55,7 +55,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="?attr/listPreferredItemHeight" android:layout_height="?attr/listPreferredItemHeight"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:textAppearance="?attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:paddingEnd="16dp"/> android:paddingEnd="16dp"/>
@@ -120,7 +120,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
android:maxLines="2" android:maxLines="2"
style="?attr/buttonBarNegativeButtonStyle" style="?attr/buttonBarButtonStyle"
android:minHeight="@dimen/alert_dialog_button_bar_height" android:minHeight="@dimen/alert_dialog_button_bar_height"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:enabled="false"
@@ -133,29 +133,64 @@
android:layout_gravity="end" android:layout_gravity="end"
android:maxLines="2" android:maxLines="2"
android:minHeight="@dimen/alert_dialog_button_bar_height" android:minHeight="@dimen/alert_dialog_button_bar_height"
style="?attr/buttonBarPositiveButtonStyle" style="?attr/buttonBarButtonStyle"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:enabled="false"
android:text="@string/activity_resolver_use_always" android:text="@string/activity_resolver_use_always"
android:onClick="onButtonClick"/> android:onClick="onButtonClick"/>
</LinearLayout> </LinearLayout>
<FrameLayout
android:id="@+id/stub"
android:layout_alwaysShow="true"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorBackgroundFloating"/>
<TabHost
android:layout_alwaysShow="true"
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">
</com.android.internal.app.ResolverViewPager>
</FrameLayout>
</LinearLayout>
</TabHost>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/dividerVertical"/> android:background="?attr/dividerVertical"/>
<ListView
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:background="?attr/colorBackgroundFloating"
android:elevation="8dp"
android:nestedScrollingEnabled="true"
android:divider="@null"/>
</LinearLayout> </LinearLayout>
</com.android.internal.widget.ResolverDrawerLayout> </com.android.internal.widget.ResolverDrawerLayout>