This repository has been archived by the owner on Nov 8, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
resolve merge conflicts of 7a7bc1f to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I19f7941a72dc7a78f68156b0f2e162bc816a4e49
- Loading branch information
Showing
15 changed files
with
580 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright 2018 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" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:minHeight="?android:attr/listPreferredItemHeightSmall" | ||
| android:gravity="center_vertical" | ||
| android:paddingStart="?android:attr/listPreferredItemPaddingStart" | ||
| android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" | ||
| android:paddingVertical="@dimen/car_preference_list_margin" | ||
| android:background="@drawable/car_card_ripple_background" | ||
| android:focusable="true" | ||
| android:orientation="horizontal"> | ||
|
|
||
| <androidx.preference.internal.PreferenceImageView | ||
| android:id="@android:id/icon" | ||
| android:layout_width="@dimen/car_drawer_list_item_icon_size" | ||
| android:layout_height="@dimen/car_drawer_list_item_icon_size" /> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical"> | ||
| <TextView | ||
| android:id="@android:id/title" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:textAlignment="viewStart" | ||
| android:textAppearance="@style/TextAppearance.Car.Subheader"/> | ||
| <TextView | ||
| android:id="@android:id/summary" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textColor="?android:attr/textColorSecondary"/> | ||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright 2018 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" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:minHeight="?android:attr/listPreferredItemHeightSmall" | ||
| android:gravity="center_vertical" | ||
| android:paddingStart="?android:attr/listPreferredItemPaddingStart" | ||
| android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" | ||
| android:paddingVertical="@dimen/car_preference_list_margin" | ||
| android:background="@drawable/car_card_ripple_background" | ||
| android:focusable="true" | ||
| android:orientation="horizontal"> | ||
|
|
||
| <Spinner | ||
| android:id="@+id/spinner" | ||
| android:layout_width="0dp" | ||
| android:layout_weight="0" | ||
| android:layout_height="wrap_content" | ||
| android:visibility="invisible" /> | ||
|
|
||
| <androidx.preference.internal.PreferenceImageView | ||
| android:id="@android:id/icon" | ||
| android:layout_width="@dimen/car_drawer_list_item_icon_size" | ||
| android:layout_height="@dimen/car_drawer_list_item_icon_size" /> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:paddingTop="@dimen/car_preference_list_margin" | ||
| android:paddingBottom="@dimen/car_preference_list_margin"> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="@style/TextAppearance.Car.Body1" /> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/summary" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="@style/TextAppearance.Car.Body2" /> | ||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright 2018 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. | ||
| --> | ||
|
|
||
| <RelativeLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:minHeight="?android:attr/listPreferredItemHeightSmall" | ||
| android:paddingStart="?android:attr/listPreferredItemPaddingStart" | ||
| android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" | ||
| android:paddingVertical="@dimen/car_preference_list_margin" | ||
| android:background="@drawable/car_card_ripple_background" | ||
| android:focusable="true"> | ||
|
|
||
| <androidx.preference.internal.PreferenceImageView | ||
| android:id="@android:id/icon" | ||
| android:layout_width="@dimen/car_drawer_list_item_icon_size" | ||
| android:layout_height="@dimen/car_drawer_list_item_icon_size" | ||
| android:layout_alignParentStart="true" | ||
| android:layout_centerVertical="true"/> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:layout_toEndOf="@android:id/icon" | ||
| android:layout_centerVertical="true"> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:textAppearance="@style/TextAppearance.Car.Body1" /> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/summary" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="@style/TextAppearance.Car.Body2" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <!-- Preference should place its actual preference widget here. --> | ||
| <FrameLayout | ||
| android:id="@android:id/widget_frame" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_centerVertical="true" | ||
| android:layout_alignParentEnd="true" /> | ||
|
|
||
| </RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright 2018 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. | ||
| --> | ||
|
|
||
| <FrameLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:minHeight="?android:attr/listPreferredItemHeightSmall" | ||
| android:paddingStart="?android:attr/listPreferredItemPaddingStart" | ||
| android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" | ||
| android:paddingVertical="@dimen/car_preference_list_margin" | ||
| android:background="@drawable/car_card_ripple_background" | ||
| android:focusable="true"> | ||
|
|
||
| <!-- Wrap in a FrameLayout so the full list item has a touch ripple --> | ||
| <RelativeLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"> | ||
|
|
||
| <androidx.preference.internal.PreferenceImageView | ||
| android:id="@android:id/icon" | ||
| android:layout_width="@dimen/car_drawer_list_item_small_icon_size" | ||
| android:layout_height="@dimen/car_drawer_list_item_small_icon_size" | ||
| android:layout_centerVertical="true" | ||
| android:layout_alignParentStart="true"/> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:layout_toEndOf="@android:id/icon" | ||
| android:layout_centerVertical="true"> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:textAppearance="@style/TextAppearance.Car.Label1" /> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/summary" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="@style/TextAppearance.Car.Body3" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <!-- Preference should place its actual preference widget here. --> | ||
| <FrameLayout | ||
| android:id="@android:id/widget_frame" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_centerVertical="true" | ||
| android:layout_alignParentEnd="true" /> | ||
|
|
||
| </RelativeLayout> | ||
|
|
||
| </FrameLayout> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright 2018 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. | ||
| --> | ||
| <!-- Layout used by SeekBarPreference for the seekbar widget style. --> | ||
| <LinearLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center_vertical" | ||
| android:minHeight="?android:attr/listPreferredItemHeight" | ||
| android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" | ||
| android:paddingStart="?android:attr/listPreferredItemPaddingStart" | ||
| android:paddingVertical="@dimen/car_preference_list_margin" | ||
| android:orientation="horizontal"> | ||
|
|
||
| <androidx.preference.internal.PreferenceImageView | ||
| android:id="@android:id/icon" | ||
| android:layout_width="@dimen/car_drawer_list_item_icon_size" | ||
| android:layout_height="@dimen/car_drawer_list_item_icon_size" /> | ||
|
|
||
| <RelativeLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <TextView | ||
| android:id="@android:id/title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:textAppearance="@style/TextAppearance.Car.Body1"/> | ||
|
|
||
| <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:textAppearance="@style/TextAppearance.Car.Body2"/> | ||
|
|
||
| <!-- Using UnPressableLinearLayout as a workaround to disable the pressed state propagation | ||
| to the children of this container layout. Otherwise, the animated pressed state will also | ||
| play for the thumb in the AbsSeekBar in addition to the preference's ripple background. | ||
| The background of the SeekBar is also set to null to disable the ripple background --> | ||
| <androidx.preference.UnPressableLinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_below="@android:id/summary" | ||
| android:layout_alignStart="@android:id/title" | ||
| android:clipChildren="false" | ||
| android:clipToPadding="false"> | ||
| <SeekBar | ||
| android:id="@+id/seekbar" | ||
| android:layout_width="0dp" | ||
| android:layout_weight="1" | ||
| android:layout_height="wrap_content" | ||
| android:paddingStart="@dimen/preference_seekbar_padding_start" | ||
| android:paddingEnd="@dimen/preference_seekbar_padding_end" | ||
| android:focusable="false" | ||
| android:clickable="false" | ||
| android:background="@null" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/seekbar_value" | ||
| android:layout_width="@dimen/preference_seekbar_value_width" | ||
| android:layout_height="match_parent" | ||
| android:gravity="right|center_vertical" | ||
| android:textAppearance="@style/TextAppearance.Car.Body2" | ||
| android:fadingEdge="horizontal" | ||
| android:scrollbars="none"/> | ||
| </androidx.preference.UnPressableLinearLayout> | ||
|
|
||
| </RelativeLayout> | ||
|
|
||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.