Merge "Output switcher panel requires large title icon for Slice slider style" into rvc-dev am: c21406a0a2 am: b2ab3dfff2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818502

Change-Id: I769ad89870ac16016683e8cfaed2488e4a6d78a7
This commit is contained in:
tim peng
2020-06-12 05:25:06 +00:00
committed by Automerger Merge Worker
10 changed files with 74 additions and 2 deletions

View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
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"
android:id="@+id/slice_slider_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
style="@style/Widget.SliceView.Panel.Slider.LargeIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="0dp"
android:paddingEnd="0dp"/>
</LinearLayout>

View File

@@ -533,6 +533,10 @@
<item name="rowStyle">@style/SliceRow.Slider</item>
</style>
<style name="Widget.SliceView.Panel.Slider.LargeIcon">
<item name="rowStyle">@style/SliceRow.Slider.LargeIcon</item>
</style>
<style name="SliceRow">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">2dp</item>
@@ -580,6 +584,11 @@
<item name="progressBarEndPadding">16dp</item>
</style>
<style name="SliceRow.Slider.LargeIcon">
<!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
<item name="iconSize">12dp</item>
</style>
<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">
<item name="android:layout_margin">16dp</item>
<item name="android:paddingStart">8dp</item>