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

Commit 5488b4e6 authored by Noah Wang's avatar Noah Wang Committed by Android (Google) Code Review
Browse files

Merge "Adding placeholder for preview screens for screen zoom (magnifying screen)"

parents 0586321e b25ccce1

res/layout/screen_zoom_preview_2.xml

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

-->



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

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:orientation="horizontal"

        android:theme="?android:attr/actionBarTheme"

        style="?android:attr/actionBarStyle">



        <TextView

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginLeft="16dp"

            android:text="@string/screen_zoom_preview_title"

            android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" />



        <ImageView

            android:layout_width="36dp"

            android:layout_height="48dp"

            style="?android:attr/actionOverflowButtonStyle" />

    </LinearLayout>



    <ScrollView

        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">



            <TextView

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="16dp"

                android:layout_marginTop="16dp"

                android:text="@string/permissions_label" />



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



            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:layout_marginLeft="62dp"

                android:layout_marginRight="8dp"

                android:background="#36000000" />



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



            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:layout_marginLeft="62dp"

                android:layout_marginRight="8dp"

                android:background="#36000000" />



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



        </LinearLayout>



    </ScrollView>

</LinearLayout>

res/layout/screen_zoom_preview_3.xml

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

-->



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

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:orientation="horizontal"

        android:theme="?android:attr/actionBarTheme"

        style="?android:attr/actionBarStyle">



        <TextView

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginLeft="16dp"

            android:text="@string/screen_zoom_preview_title"

            android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" />



        <ImageView

            android:layout_width="36dp"

            android:layout_height="48dp"

            style="?android:attr/actionOverflowButtonStyle" />

    </LinearLayout>



    <ScrollView

        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">



            <TextView

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="16dp"

                android:layout_marginTop="16dp"

                android:text="@string/permissions_label" />



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



            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:layout_marginLeft="62dp"

                android:layout_marginRight="8dp"

                android:background="#36000000" />



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



            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:layout_marginLeft="62dp"

                android:layout_marginRight="8dp"

                android:background="#36000000" />



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



        </LinearLayout>



    </ScrollView>

</LinearLayout>

src/com/android/settings/display/ScreenZoomSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme 
        mActivityLayoutResId = R.layout.screen_zoom_activity;



        // This should be replaced once the final preview sample screen is in place.

        mPreviewSampleResIds = new int[]{R.layout.screen_zoom_preview, R.layout.screen_zoom_preview,

                R.layout.screen_zoom_preview};

        mPreviewSampleResIds = new int[]{R.layout.screen_zoom_preview_1,

                R.layout.screen_zoom_preview_2,

                R.layout.screen_zoom_preview_3};



        final DisplayDensityUtils density = new DisplayDensityUtils(getContext());