Merge "UI tweaks to auto revoke" into rvc-dev (d3be5162) · Commits · e / os / android_packages_apps_PackageInstaller

res/layout/footer_preference.xml

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2020 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.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:gravity="center_vertical"
		android:paddingEnd="?android:attr/scrollbarSize"
		android:paddingRight="?android:attr/scrollbarSize"
		android:background="?android:attr/selectableItemBackground">

		<FrameLayout
		android:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="6dip"
		android:layout_marginStart="24dip"
		android:layout_gravity="top\|center">
		<androidx.preference.internal.PreferenceImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:maxWidth="24dp"
		app:maxHeight="24dp" />
		</FrameLayout>

		<RelativeLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="24dip"
		android:layout_marginLeft="24dip"
		android:layout_marginEnd="6dip"
		android:layout_marginRight="6dip"
		android:layout_marginTop="6dip"
		android:layout_marginBottom="6dip"
		android:layout_weight="1">

		<TextView android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:textColor="?android:attr/textColorPrimary"
		android:ellipsize="marquee"
		android:visibility="gone"
		android:fadingEdge="horizontal" />

		<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:layout_alignLeft="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="4" />

		<TextView android:id="@+id/summary2"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/summary"
		android:layout_alignStart="@android:id/title"
		android:layout_alignLeft="@android:id/title"
		android:layout_marginTop="20dp"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="4" />

		</RelativeLayout>

		<!-- Preference should place its actual preference widget here. -->
		<LinearLayout android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center_vertical"
		android:orientation="vertical" />

		</LinearLayout>

res/values-night/themes.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -37,4 +37,8 @@
		<style name="PermissionDialog"
		parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
		</style>

		<style name="AutoRevokeDivider">
		<item name="android:background">@color/divider_color_secondary</item>
		</style>
		</resources>
		No newline at end of file

res/values/colors.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,4 +20,6 @@
		<color name="google_grey_800">#3C4043</color>
		<color name="system_notification_accent_color">#ff607D8B</color>
		<color name="incident_reason_bullet_color">#de000000</color>
		<color name="divider_color_primary">#24000000</color>
		<color name="divider_color_secondary">#85FFFFFF</color>
		</resources>

res/values/themes.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,10 @@
		<item name="carDividerColor">@*android:color/car_list_divider</item>
		</style>

		<style name="AutoRevokeDivider">
		<item name="android:background">@color/divider_color_primary</item>
		</style>

res/xml/two_button_preference_widget.xml→res/xml/uninstall_button_preference_widget.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -20,19 +20,19 @@
		android:layout_height="match_parent"
		android:orientation="horizontal" >
		<View
		android:id="@+id/divider_two"
		android:id="@+id/divider"
		android:layout_width="1dp"
		android:layout_height="40dp"
		android:layout_marginLeft="5dp"
		android:layout_marginRight="5dp"
		android:layout_height="24dp"
		android:layout_marginLeft="16dp"
		android:layout_marginRight="16dp"
		android:layout_gravity="end\|center_vertical"
		android:background="?android:attr/textColorSecondary"/>
		android:theme="@style/AutoRevokeDivider"/>

		<ImageButton
		android:id="@+id/uninstall_button"
		style="@style/SettingsActionButton"
		android:layout_width="40dp"
		android:layout_height="40dp"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="end\|center_vertical"
		android:contentDescription="@string/uninstall_or_disable"
		android:src="@drawable/ic_settings_delete"