Merge "Setting Dashboard - padding updates" into lmp-preview-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
734290e9ea
@@ -18,8 +18,8 @@
|
|||||||
android:id="@+id/dashboard"
|
android:id="@+id/dashboard"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:paddingStart="@*android:dimen/preference_fragment_padding_side"
|
android:paddingStart="@dimen/dashboard_padding_start"
|
||||||
android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
|
android:paddingEnd="@dimen/dashboard_padding_end"
|
||||||
android:scrollbarStyle="outsideOverlay"
|
android:scrollbarStyle="outsideOverlay"
|
||||||
android:background="@color/dashboard_background_color">
|
android:background="@color/dashboard_background_color">
|
||||||
|
|
||||||
|
@@ -23,10 +23,11 @@
|
|||||||
<TextView android:id="@+id/category_title"
|
<TextView android:id="@+id/category_title"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="@dimen/dashboard_category_title_height"
|
android:layout_height="@dimen/dashboard_category_title_height"
|
||||||
|
android:paddingStart="@dimen/dashboard_category_title_padding_start"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:textAppearance="@style/TextAppearance.Small"
|
android:textAppearance="@style/TextAppearance.CategoryTitle"
|
||||||
android:textAlignment="viewStart"
|
android:textAlignment="viewStart"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/TextAppearance.Medium"
|
android:textAppearance="@style/TextAppearance.TileTitle"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
android:fadingEdge="horizontal" />
|
android:fadingEdge="horizontal" />
|
||||||
|
|
||||||
|
@@ -88,17 +88,24 @@
|
|||||||
<dimen name="zen_mode_dropdown_width">160dp</dimen>
|
<dimen name="zen_mode_dropdown_width">160dp</dimen>
|
||||||
|
|
||||||
<!-- Dashboard padding between each tiles within the layout -->
|
<!-- Dashboard padding between each tiles within the layout -->
|
||||||
<dimen name="dashboard_cell_gap">4dp</dimen>
|
<dimen name="dashboard_cell_gap">1dp</dimen>
|
||||||
|
|
||||||
|
<!-- Dashboard padding in its container -->
|
||||||
|
<dimen name="dashboard_padding_start">1dp</dimen>
|
||||||
|
<dimen name="dashboard_padding_end">1dp</dimen>
|
||||||
|
|
||||||
<!-- Dashboard category title layout height -->
|
<!-- Dashboard category title layout height -->
|
||||||
<dimen name="dashboard_category_title_height">48dp</dimen>
|
<dimen name="dashboard_category_title_height">48dp</dimen>
|
||||||
|
|
||||||
|
<!-- Dashboard category title padding start -->
|
||||||
|
<dimen name="dashboard_category_title_padding_start">12dp</dimen>
|
||||||
|
|
||||||
<!-- SwitchBar padding start -->
|
<!-- SwitchBar padding start -->
|
||||||
<dimen name="switchbar_padding_start">84dp</dimen>
|
<dimen name="switchbar_padding_start">68dp</dimen>
|
||||||
<!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side -->
|
<!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side -->
|
||||||
<dimen name="switchbar_padding_end">32dp</dimen>
|
<dimen name="switchbar_padding_end">32dp</dimen>
|
||||||
|
|
||||||
<!-- ActionBar contentInsetStart -->
|
<!-- ActionBar contentInsetStart -->
|
||||||
<dimen name="actionbar_contentInsetStart">84dp</dimen>
|
<dimen name="actionbar_contentInsetStart">68dp</dimen>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -264,4 +264,14 @@
|
|||||||
<style name="TextAppearance.Switch" parent="TextAppearance.Medium">
|
<style name="TextAppearance.Switch" parent="TextAppearance.Medium">
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Quantum.Small">
|
||||||
|
<item name="android:textColor">#FF009688</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Quantum.Medium">
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Quantum.Small">
|
||||||
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
Reference in New Issue
Block a user