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

Commit 3c7a7a92 authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Align system navigation setting link in AllSet page for tablets to... 

Merge "Align system navigation setting link in AllSet page for tablets to top/start." into tm-qpr-dev
parents 267d7179 2335490f

quickstep/res/layout-sw600dp-land/allset_navigation_and_hint.xml

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

<!-- Copyright (C) 2022 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.

-->

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <TextView

        android:id="@+id/navigation_settings"

        style="@style/TextAppearance.GestureTutorial.LinkText"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="32dp"

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

        android:minHeight="48dp"

        android:text="@string/allset_navigation_settings"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/subtitle" />



    <TextView

        android:id="@+id/hint"

        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/allset_page_margin_bottom"

        android:text="@string/allset_hint"

        android:textSize="@dimen/allset_page_swipe_up_text_size"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent" />



</merge>
 
 No newline at end of file

quickstep/res/layout-sw600dp/allset_navigation_and_hint.xml

+3 −4
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@ 
        style="@style/TextAppearance.GestureTutorial.LinkText"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="96dp"

        android:layout_marginTop="24dp"

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

        android:minHeight="48dp"

        android:text="@string/allset_navigation_settings"

        app:layout_constraintBottom_toTopOf="@id/hint"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/subtitle"

        app:layout_constraintStart_toStartOf="parent" />



    <TextView
@@ -34,7 +33,7 @@ 
        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/allset_page_margin_bottom"

        android:layout_marginBottom="24dp"

        android:text="@string/allset_hint"

        android:textSize="@dimen/allset_page_swipe_up_text_size"

        app:layout_constraintBottom_toBottomOf="parent"

quickstep/res/values-sw600dp-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,6 +20,5 @@ 


    <!-- All Set page -->

    <dimen name="allset_page_margin_horizontal">48dp</dimen>

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



</resources>

quickstep/res/values-sw600dp/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


    <!-- All Set page -->

    <dimen name="allset_page_margin_horizontal">120dp</dimen>

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

    <dimen name="allset_page_allset_text_size">38sp</dimen>

    <dimen name="allset_page_swipe_up_text_size">15sp</dimen>

quickstep/res/values-sw720dp-land/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,4 @@ 
<resources>

    <!--  Overview actions  -->

    <dimen name="overview_actions_top_margin">20dp</dimen>



    <!-- All Set page-->

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

</resources>