diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/car_settings_frame.xml | 90 | ||||
| -rw-r--r-- | res/values/overlayable.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 17 | ||||
| -rw-r--r-- | res/values/themes.xml | 8 |
4 files changed, 1 insertions, 120 deletions
diff --git a/res/layout/car_settings_frame.xml b/res/layout/car_settings_frame.xml deleted file mode 100644 index 4381d014..00000000 --- a/res/layout/car_settings_frame.xml +++ /dev/null @@ -1,90 +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. ---> - -<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="match_parent" - android:orientation="vertical"> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="@*android:dimen/car_app_bar_height"> - - <FrameLayout - android:id="@+id/back_button" - android:layout_width="0dp" - android:layout_height="0dp" - android:background="?android:attr/selectableItemBackground" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/start_margin" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - <ImageView - android:layout_width="@*android:dimen/car_primary_icon_size" - android:layout_height="@*android:dimen/car_primary_icon_size" - android:layout_gravity="center" - android:scaleType="fitCenter" - android:src="@drawable/ic_arrow_back" - android:tint="?android:attr/textColorPrimary"/> - </FrameLayout> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/start_margin" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@*android:dimen/action_bar_margin_start"/> - - <TextView - android:id="@+id/label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceLarge" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/start_margin" - app:layout_constraintTop_toTopOf="parent"/> - - <Button - android:id="@+id/action" - style="@*android:style/ActionBarButton" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginEnd="@*android:dimen/action_bar_button_margin" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent"/> - </androidx.constraintlayout.widget.ConstraintLayout> - - <ProgressBar - android:id="@+id/progress_bar" - style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:indeterminate="true" - android:visibility="gone"/> - - <FrameLayout - android:id="@android:id/list_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingEnd="@*android:dimen/car_margin" - android:paddingStart="@*android:dimen/car_margin"/> -</LinearLayout> diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 6d0dda5a..2bcb571a 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -248,14 +248,8 @@ <item type="dimen" name="car_icon_size" /> <!-- END CAR DIMENS --> - <!-- START CAR STYLES --> - <item type="style" name="CarPreferenceFragment" /> - <item type="style" name="CarPreferenceFragmentList" /> - <!-- END CAR STYLES --> - <!-- START CAR THEMES --> <item type="style" name="CarSettings" /> - <item type="style" name="CarPreferenceTheme" /> <!-- END CAR THEMES --> </policy> diff --git a/res/values/styles.xml b/res/values/styles.xml index 5516dbe3..55c47787 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -869,21 +869,4 @@ <!-- END ACCESSIBILITY SERVICE DIALOG ITEM --> - <!-- START CAR SETTINGS PREFERENCE STYLES --> - - <style name="CarPreferenceFragment"> - <item name="android:layout">@layout/car_settings_frame</item> - </style> - - <style name="CarPreferenceFragmentList"> - <item name="android:paddingTop">0dp</item> - <item name="android:paddingBottom">0dp</item> - <item name="android:paddingStart">0dp</item> - <item name="android:paddingEnd">0dp</item> - <item name="android:paddingLeft">0dp</item> - <item name="android:paddingRight">0dp</item> - </style> - - <!-- END CAR SETTINGS PREFERENCE STYLES --> - </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index b8ed550a..fb456402 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -77,14 +77,8 @@ parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> </style> - <style name="CarSettings" parent="@android:style/Theme.DeviceDefault.NoActionBar"> - <item name="preferenceTheme">@style/CarPreferenceTheme</item> + <style name="CarSettings" parent="Theme.CarUi"> <item name="carDividerColor">@*android:color/car_list_divider</item> </style> - <style name="CarPreferenceTheme"> - <item name="preferenceFragmentCompatStyle">@style/CarPreferenceFragment</item> - <item name="preferenceFragmentListStyle">@style/CarPreferenceFragmentList</item> - </style> - </resources> |