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

Commit 36b15ba0 authored by Noah Wang's avatar Noah Wang Committed by android-build-merger
Browse files

Merge "Remove the preview screens from Display/Font size settings when the... 

Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev
am: 7444be6f

* commit '7444be6f':
  Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf

Change-Id: Ia5097feabb5da6713634a2466a15b0c809d6ea58
parents 105c088d 7444be6f

res/layout-h360dp/font_size_activity.xml

0 → 100644
+100 −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.

-->



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

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:fillViewport="true">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



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



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

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

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



            <com.android.settings.widget.DotsPageIndicator

                android:id="@+id/page_indicator"

                style="@style/PreviewPagerPageIndicator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:padding="6dp" />



            <TextView

                android:id="@+id/current_label"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:padding="6dp"

                android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

                android:elevation="2dp" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:paddingTop="8dp">



                <ImageView

                    android:id="@+id/smaller"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_font_size_16dp"

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

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"

                    android:contentDescription="@string/font_size_make_smaller_desc" />



                <com.android.settings.widget.LabeledSeekBar

                    android:id="@+id/seek_bar"

                    android:layout_width="0dp"

                    android:layout_height="48dp"

                    android:layout_weight="1"

                    style="@android:style/Widget.Material.SeekBar.Discrete"/>



                <ImageView

                    android:id="@+id/larger"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_font_size_24dp"

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

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"

                    android:contentDescription="@string/font_size_make_larger_desc" />

            </LinearLayout>



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/font_size_summary"

                android:layout_marginBottom="16dp"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

        </LinearLayout>

    </LinearLayout>

</ScrollView>

res/layout-h360dp/screen_zoom_activity.xml

0 → 100644
+99 −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.

-->



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

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:fillViewport="true">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



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



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

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

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



            <com.android.settings.widget.DotsPageIndicator

                android:id="@+id/page_indicator"

                style="@style/PreviewPagerPageIndicator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:padding="6dp" />



            <TextView

                android:id="@+id/current_label"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:padding="6dp"

                android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

                android:elevation="2dp" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_vertical">



                <ImageView

                    android:id="@+id/smaller"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_remove_24dp"

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

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"

                    android:contentDescription="@string/screen_zoom_make_smaller_desc" />



                <com.android.settings.widget.LabeledSeekBar

                    android:id="@+id/seek_bar"

                    android:layout_width="0dp"

                    android:layout_height="48dp"

                    android:layout_weight="1"

                    style="@android:style/Widget.Material.SeekBar.Discrete"/>



                <ImageView

                    android:id="@+id/larger"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_add_24dp"

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

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"

                    android:contentDescription="@string/screen_zoom_make_larger_desc" />

            </LinearLayout>



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/screen_zoom_summary"

                android:layout_marginBottom="16dp"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

        </LinearLayout>

    </LinearLayout>

</ScrollView>

res/layout/font_size_activity.xml

+49 −65
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ 
            android:layout_height="match_parent"

            android:fillViewport="true">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



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



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"
@@ -34,14 +27,6 @@ 
        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

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



            <com.android.settings.widget.DotsPageIndicator

                android:id="@+id/page_indicator"

                style="@style/PreviewPagerPageIndicator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:padding="6dp" />



        <TextView

            android:id="@+id/current_label"

            android:layout_width="wrap_content"
@@ -96,5 +81,4 @@ 
            android:layout_marginBottom="16dp"

            android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

    </LinearLayout>

    </LinearLayout>

</ScrollView>

res/layout/screen_zoom_activity.xml

+48 −64
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ 
            android:layout_height="match_parent"

            android:fillViewport="true">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >



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



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"
@@ -34,14 +27,6 @@ 
        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

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



            <com.android.settings.widget.DotsPageIndicator

                android:id="@+id/page_indicator"

                style="@style/PreviewPagerPageIndicator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:padding="6dp" />



        <TextView

            android:id="@+id/current_label"

            android:layout_width="wrap_content"
@@ -95,5 +80,4 @@ 
            android:layout_marginBottom="16dp"

            android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

    </LinearLayout>

    </LinearLayout>

</ScrollView>

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ 


    <!-- Display Size and Font Size preview screen -->

    <dimen name="preview_pager_padding">8dp</dimen>

    <dimen name="preview_pager_min_height">200dp</dimen>

    <dimen name="preview_pager_min_height">240dp</dimen>



    <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->

    <dimen name="redaction_padding_start">16dp</dimen>