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

Commit 4b67c1a8 authored by Anna Galusza's avatar Anna Galusza Committed by Android (Google) Code Review
Browse files

Merge "Add Screen Zoom preview screen with settings page, launch Talkback... 

Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev
parents 42ed344f 384fa2e3

res/layout/preview_seek_bar_view_pager.xml

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
        android:id="@+id/preview_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="?android:attr/colorBackgroundFloating" />

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

        android:importantForAccessibility="noHideDescendants"/>



    <View

        android:layout_width="match_parent"

res/layout/screen_zoom_preview_2.xml

+4 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project

<!-- 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.
@@ -13,11 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

<com.android.settings.display.AppGridView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbars="none"

    android:background="?android:attr/colorBackgroundFloating">



</ScrollView>
 
    android:layout_height="match_parent" />

res/layout/screen_zoom_preview_3.xml

deleted100644 → 0
+0 −20
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.

-->



<com.android.settings.display.AppGridView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

res/layout/screen_zoom_preview_settings.xml

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

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbars="none"

    android:background="?android:attr/colorBackgroundFloating">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <!-- Wifi Setting -->

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="8dp"

            android:orientation="horizontal">



            <ImageView

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:src="@drawable/wifi_signal_dark"

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

                android:scaleType="center" />



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:orientation="vertical"

                android:paddingStart="16dp">



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/wifi_settings"

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

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





                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/wifi_display_status_not_available"

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

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

            </LinearLayout>

        </LinearLayout>



        <!-- Data usage Setting -->

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="8dp"

            android:orientation="horizontal">



            <ImageView

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:src="@drawable/ic_settings_data_usage"

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

                android:scaleType="center" />



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:orientation="vertical"

                android:paddingStart="16dp">



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/data_usage_summary_title"

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

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



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/no_data_usage"

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

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

            </LinearLayout>

        </LinearLayout>



        <!-- Display Setting -->

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="8dp"

            android:orientation="horizontal">



            <ImageView

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:src="@drawable/ic_settings_display"

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

                android:scaleType="center" />



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:orientation="vertical"

                android:paddingStart="16dp">



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/display_settings_title"

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

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



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/display_summary_on"

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

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

            </LinearLayout>

        </LinearLayout>



        <!-- Sound & Notification Setting -->

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="8dp"

            android:orientation="horizontal">



            <ImageView

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:src="@drawable/ic_settings_sound"

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

                android:scaleType="center" />



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:orientation="vertical"

                android:paddingStart="16dp">



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/sound_settings"

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

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



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/sound_settings_example_summary"

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

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

            </LinearLayout>

        </LinearLayout>



        <!-- Apps Setting -->

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="8dp"

            android:orientation="horizontal">



            <ImageView

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:src="@drawable/ic_settings_applications"

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

                android:scaleType="center" />



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:orientation="vertical"

                android:paddingStart="16dp">



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/applications_settings"

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

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



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/apps_summary_example"

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

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

            </LinearLayout>

        </LinearLayout>

    </LinearLayout>

</ScrollView>

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -5768,6 +5768,9 @@ 
    <!-- Sound: Dashboard summary. [CHAR LIMIT=100] -->

    <string name="sound_settings_summary">Ringer volume at <xliff:g id="percentage" example="2">%1$s</xliff:g></string>









    <!-- Sound: Dashboard summary example used in Setup Wizard preview screen. [CHAR LIMIT=100] -->









    <string name="sound_settings_example_summary">Ringer volume at 80%</string>

















    <!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->









    <string name="media_volume_option_title">Media volume</string>
















@@ -6943,6 +6946,8 @@















    <!-- Summary of apps [CHAR LIMIT=NONE] -->









    <string name="apps_summary"><xliff:g id="count" example="24">%1$d</xliff:g> apps installed</string>









    <!-- Example summary of apps used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->









    <string name="apps_summary_example">24 apps installed</string>

















    <!-- Summary of storage usage [CHAR LIMIT=NONE] -->









    <string name="storage_summary"><xliff:g id="size1" example="8GB">%1$s</xliff:g> of <xliff:g id="size2" example="32GB">%2$s</xliff:g> used</string>