Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57b6bab8 authored by Danny Epstein's avatar Danny Epstein Committed by android-build-merger
Browse files

Merge \"Reduce padding and font sizes for watch preferences. - Reduce icon... 

Merge \"Reduce padding and font sizes for watch preferences. - Reduce icon size and padding. - Reduce widget padding. - Reduce font size of styles used in preferences.\" into nyc-mr1-dev
am: f688a689

Change-Id: If6cb85397eb35e3d55e5cd379fca399f6f01b971
parents 4b780d6b f688a689

core/res/res/layout/preference_micro.xml

0 → 100644
+82 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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 for a Preference in a PreferenceActivity. The

     Preference is able to place a specific widget for its particular

     type in the "widget_frame" layout. -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:paddingStart="?attr/listPreferredItemPaddingStart"

    android:paddingEnd="?attr/listPreferredItemPaddingEnd"

    android:background="?attr/activatedBackgroundIndicator"

    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="-4dp"

        android:minWidth="32dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="8dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

            android:id="@+id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxWidth="24dp"

            android:maxHeight="24dp" />

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <TextView android:id="@+id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxLines="2"

            android:textAppearance="?attr/textAppearanceListItem"

            android:ellipsize="end" />



        <TextView android:id="@+id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/title"

            android:layout_alignStart="@id/title"

            android:textAppearance="?attr/textAppearanceListItemSecondary"

            android:textColor="?attr/textColorSecondary"

            android:maxLines="10" />



    </RelativeLayout>



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout android:id="@+id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:paddingStart="4dp"

        android:orientation="vertical" />



</LinearLayout>

core/res/res/values/dimens_micro.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
    <dimen name="text_size_headline_micro">22sp</dimen>

    <dimen name="text_size_title_micro">20sp</dimen>

    <dimen name="text_size_subtitle_micro">18sp</dimen>

    <dimen name="text_size_body1_micro">16sp</dimen>

    <dimen name="text_size_body2_micro">14sp</dimen>

    <dimen name="text_size_body_1_micro">16sp</dimen>

    <dimen name="text_size_body_2_micro">14sp</dimen>

    <dimen name="text_size_caption_micro">12sp</dimen>



    <dimen name="text_size_large_micro">20sp</dimen>

core/res/res/values/styles_micro.xml

+32 −2
Original line number Diff line number Diff line
@@ -14,6 +14,36 @@ 
     limitations under the License.

-->

<resources>

    <!-- Preference styles -->

    <eat-comment/>

    <style name="Preference.Micro" parent="Preference.Material">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.CheckBoxPreference" parent="Preference.Material.CheckBoxPreference">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.SwitchPreference" parent="Preference.Material.SwitchPreference">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.PreferenceScreen" parent="Preference.Material.PreferenceScreen">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.DialogPreference" parent="Preference.Material.DialogPreference">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.DialogPreference.YesNoPreference" parent="Preference.Material.DialogPreference.YesNoPreference">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.DialogPreference.SeekBarPreference" parent="Preference.Material.DialogPreference.SeekBarPreference">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.DialogPreference.EditTextPreference" parent="Preference.Material.DialogPreference.EditTextPreference">

        <item name="layout">@layout/preference_micro</item>

    </style>

    <style name="Preference.Micro.RingtonePreference" parent="Preference.Material.RingtonePreference">

        <item name="layout">@layout/preference_micro</item>

    </style>



    <style name="Animation.Micro"/>



    <style name="Animation.Micro.Activity" parent="Animation.Material.Activity">
@@ -88,11 +118,11 @@ 
    </style>



    <style name="TextAppearance.Micro.Body1">

        <item name="textSize">@dimen/text_size_body1_micro</item>

        <item name="textSize">@dimen/text_size_body_1_micro</item>

    </style>



    <style name="TextAppearance.Micro.Body2">

        <item name="textSize">@dimen/text_size_body2_micro</item>

        <item name="textSize">@dimen/text_size_body_2_micro</item>

    </style>



    <style name="TextAppearance.Micro.Caption">

core/res/res/values/themes_micro.xml

+24 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 
        <item name="textAppearanceMedium">@style/TextAppearance.Micro.Medium</item>

        <item name="textAppearanceSmall">@style/TextAppearance.Micro.Small</item>



        <item name="textAppearanceListItem">@style/TextAppearance.Micro.Subtitle</item>

        <item name="textAppearanceListItem">@style/TextAppearance.Micro.Body1</item>

        <item name="textAppearanceListItemSmall">@style/TextAppearance.Micro.Body1</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Micro.Body2</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Micro.Caption</item>

        <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_left_micro</item>

        <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_right_micro</item>

        <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_left_micro</item>
@@ -56,6 +56,15 @@ 
        <!-- Preference styles -->

        <item name="preferenceFragmentStyle">@style/PreferenceFragment.Micro</item>

        <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Micro</item>

        <item name="preferenceStyle">@style/Preference.Micro</item>

        <item name="preferenceScreenStyle">@style/Preference.Micro.PreferenceScreen</item>

        <item name="checkBoxPreferenceStyle">@style/Preference.Micro.CheckBoxPreference</item>

        <item name="switchPreferenceStyle">@style/Preference.Micro.SwitchPreference</item>

        <item name="yesNoPreferenceStyle">@style/Preference.Micro.DialogPreference.YesNoPreference</item>

        <item name="dialogPreferenceStyle">@style/Preference.Micro.DialogPreference</item>

        <item name="seekBarDialogPreferenceStyle">@style/Preference.Micro.DialogPreference.SeekBarPreference</item>

        <item name="editTextPreferenceStyle">@style/Preference.Micro.DialogPreference.EditTextPreference</item>

        <item name="ringtonePreferenceStyle">@style/Preference.Micro.RingtonePreference</item>

    </style>



    <style name="Theme.Micro" parent="Theme.MicroBase">
@@ -73,6 +82,19 @@ 
        <item name="windowIsFloating">false</item>

        <!-- Required to force windowInsets dispatch through application UI. -->

        <item name="windowOverscan">true</item>



        <!-- Preference styles -->

        <item name="preferenceFragmentStyle">@style/PreferenceFragment.Micro</item>

        <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Micro</item>

        <item name="preferenceStyle">@style/Preference.Micro</item>

        <item name="preferenceScreenStyle">@style/Preference.Micro.PreferenceScreen</item>

        <item name="checkBoxPreferenceStyle">@style/Preference.Micro.CheckBoxPreference</item>

        <item name="switchPreferenceStyle">@style/Preference.Micro.SwitchPreference</item>

        <item name="yesNoPreferenceStyle">@style/Preference.Micro.DialogPreference.YesNoPreference</item>

        <item name="dialogPreferenceStyle">@style/Preference.Micro.DialogPreference</item>

        <item name="seekBarDialogPreferenceStyle">@style/Preference.Micro.DialogPreference.SeekBarPreference</item>

        <item name="editTextPreferenceStyle">@style/Preference.Micro.DialogPreference.EditTextPreference</item>

        <item name="ringtonePreferenceStyle">@style/Preference.Micro.RingtonePreference</item>

    </style>



    <!-- Indirection needed for overlays to make sure there is a common base parent -->