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

Commit 41270645 authored by Roger Xue's avatar Roger Xue Committed by Android (Google) Code Review
Browse files

Merge "making changes to settingsLib so we can create car setting using settingsLib"

parents c63cdbc8 8f06ab07

packages/SettingsLib/res/layout/drawer_category.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
        android:background="?android:attr/listDivider" />



    <TextView

        style="@style/TextAppearanceSmall"

        android:id="@android:id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="48dp"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:paddingStart="16dp"

        android:textAppearance="?android:attr/textAppearanceSmall" />

        android:paddingStart="16dp" />



</LinearLayout>

packages/SettingsLib/res/layout/drawer_item.xml

+10 −7
Original line number Diff line number Diff line
@@ -23,19 +23,22 @@ 


    <ImageView

        android:id="@android:id/icon"

        android:layout_width="72dp"

        android:layout_height="24dp"

        android:layout_width="@dimen/drawer_icon_size"

        android:layout_height="@dimen/drawer_icon_size"

        android:layout_marginStart="@dimen/drawer_icon_margin"

        android:layout_marginEnd="@dimen/drawer_icon_margin"

        android:layout_marginTop="@dimen/drawer_item_top_bottom_margin"

        android:layout_marginBottom="@dimen/drawer_item_top_bottom_margin"

        android:scaleType="fitCenter"

        android:layout_gravity="center_vertical"

        android:tint="?android:attr/colorAccent"

        android:paddingStart="16dp"

        android:paddingEnd="32dp" />

        android:tint="?android:attr/colorAccent"/>



    <TextView

        android:textAppearance="@style/TextAppearanceMedium"

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:textColor="?android:attr/colorControlNormal"

        android:textAppearance="?android:attr/textAppearanceMedium" />

        android:textColor="?android:attr/colorControlNormal" />



</LinearLayout>

packages/SettingsLib/res/layout/drawer_spacer.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/spacer"

    android:layout_width="match_parent"

    android:layout_height="32dp" />
 
    android:layout_height="@dimen/drawer_spacer_height" />

packages/SettingsLib/res/layout/settings_with_drawer.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    </LinearLayout>

    <!-- The navigation drawer -->

    <ListView android:id="@+id/left_drawer"

        android:layout_width="300dp"

        android:layout_width="@dimen/drawer_width"

        android:layout_height="match_parent"

        android:layout_gravity="start"

        android:choiceMode="singleChoice"

packages/SettingsLib/res/values/dimens.xml

+6 −1
Original line number Diff line number Diff line
@@ -51,5 +51,10 @@ 


    <dimen name="usage_graph_dot_size">.75dp</dimen>

    <dimen name="usage_graph_dot_interval">7dp</dimen>



    <dimen name="drawer_icon_size">24dp</dimen>

    <dimen name="normal_icon_size">24dp</dimen>

    <dimen name="drawer_icon_margin">24dp</dimen>

    <dimen name="drawer_width">300dp</dimen>

    <dimen name="drawer_item_top_bottom_margin">4dp</dimen>

    <dimen name="drawer_spacer_height">32dp</dimen>

</resources>