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

Commit d65ab0e6 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Align more prefs for icon space.""

parents 75be542b 8af4c104

res/layout/preference_category_material_settings.xml

+5 −18
Original line number Diff line number Diff line
@@ -40,26 +40,13 @@ 
            android:maxHeight="18dp"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="60dp"

        android:orientation="vertical">

    <TextView

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="@android:style/TextAppearance.Material.Body2"

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

        android:paddingStart="60dp"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>

        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

            android:ellipsize="end"

            android:singleLine="true" />

    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

res/layout/restricted_preference_dropdown.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ 
            android:layout_height="wrap_content"

            android:visibility="invisible" />



    <include layout="@layout/preference_material_settings" />

    <include layout="@layout/preference_material" />



</FrameLayout>
 
 No newline at end of file

res/layout/storage_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:orientation="vertical"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="16dip"

    android:paddingBottom="16dip"

res/layout/storage_summary.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:orientation="vertical"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="16dip"

    android:paddingBottom="16dip"

res/layout/work_profile_category.xml

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

<!-- Copyright (C) 2015 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 for "Work" preference group in Accounts. -->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginBottom="16dip"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="16dip"

    android:orientation="vertical">

    <TextView

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@android:style/TextAppearance.Material.Body2"

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

    <TextView

        android:id="@android:id/summary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

        android:ellipsize="end"

        android:singleLine="true" />

</LinearLayout>
 
 No newline at end of file