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

Commit 19a1c476 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adds AllSetActivity in Launcher." into sc-dev

parents 04b5003b 474c616e
Loading
Loading
Loading
Loading
+28 −4
Original line number Diff line number Diff line
@@ -103,16 +103,40 @@
             android:clearTaskOnLaunch="true"
             android:exported="false"/>

        <!--
        Activity for gesture nav onboarding.
        It's protected by android.permission.REBOOT to ensure that only system apps can start it
        (setup wizard already has this permission)
        -->
        <activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"
            android:autoRemoveFromRecents="true"
            android:excludeFromRecents="true"
            android:screenOrientation="portrait"
            android:permission="android.permission.REBOOT"
            android:exported="true">
            <intent-filter>
                <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>
                <category android:name="android.intent.category.DEFAULT"/>
            </intent-filter>
        </activity>

        <!--
        Activity following gesture nav onboarding.
        It's protected by android.permission.REBOOT to ensure that only system apps can start it
        (setup wizard already has this permission)
        -->
        <activity android:name="com.android.quickstep.interaction.AllSetActivity"
            android:autoRemoveFromRecents="true"
            android:excludeFromRecents="true"
            android:screenOrientation="portrait"
            android:permission="android.permission.REBOOT"
            android:exported="true">
            <intent-filter>
                <action android:name="com.android.quickstep.action.GESTURE_ONBOARDING_ALL_SET"/>
                <category android:name="android.intent.category.DEFAULT"/>
            </intent-filter>
        </activity>

        <activity
            android:name=".hybridhotseat.HotseatEduActivity"
            android:theme="@android:style/Theme.NoDisplay"
+24 −0
Original line number Diff line number Diff line
<!--
     Copyright (C) 2021 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="42dp"
    android:height="40dp"
    android:viewportWidth="42"
    android:viewportHeight="40">
    <path
        android:pathData="M38,14H25.38L27.28,4.86L27.34,4.22C27.34,3.4 27,2.64 26.46,2.1L24.34,0C24.34,0 10.16,13.7 10,14H0V40H32C33.66,40 35.08,39 35.68,37.56L41.72,23.46C41.9,23 42,22.52 42,22V18C42,15.8 40.2,14 38,14ZM10,36H4V18H10V36ZM38,22L32,36H14V16L22.68,7.32L20,18H38V22Z"
        android:fillColor="#FFFFFF"/>
</vector>
+80 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2021 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.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingStart="@dimen/allset_page_margin_horizontal"
    android:paddingEnd="@dimen/allset_page_margin_horizontal"
    android:layoutDirection="locale"
    android:textDirection="locale"
    android:background="?android:attr/colorBackground">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_alignParentTop="true"
        android:layout_gravity="start"
        android:gravity="start"
        android:orientation="vertical">

        <ImageView
            android:id="@+id/icon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/allset_title_icon_margin_top"
            android:src="@drawable/ic_all_set"/>

        <TextView
            android:id="@+id/title"
            style="@style/TextAppearance.GestureTutorial.Feedback.Title"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/allset_title_margin_top"
            android:gravity="start"
            android:text="@string/allset_title"/>

        <TextView
            android:id="@+id/subtitle"
            style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/allset_subtitle_margin_top"
            android:gravity="start"
            android:text="@string/allset_description"/>
    </LinearLayout>

    <TextView
        android:id="@+id/navigation_settings"
        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
        android:textSize="14sp"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_above="@+id/hint"
        android:gravity="center_horizontal"
        android:layout_marginBottom="72dp"/>

    <TextView
        android:id="@id/hint"
        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
        android:textSize="14sp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginBottom="@dimen/allset_hint_margin_bottom"
        android:layout_alignParentBottom="true"
        android:layout_centerHorizontal="true"
        android:text="@string/allset_hint"/>
</RelativeLayout>
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2021 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.
-->
<resources>
    <declare-styleable name="AllSetLinkSpan">
        <attr name="android:textSize"/>
        <attr name="android:fontFamily"/>
    </declare-styleable>
</resources>
+7 −0
Original line number Diff line number Diff line
@@ -99,6 +99,13 @@
    <dimen name="gesture_tutorial_feedback_margin_start_end">24dp</dimen>
    <dimen name="gesture_tutorial_button_margin_start_end">18dp</dimen>

    <!-- All Set page -->
    <dimen name="allset_page_margin_horizontal">40dp</dimen>
    <dimen name="allset_title_margin_top">28dp</dimen>
    <dimen name="allset_title_icon_margin_top">80dp</dimen>
    <dimen name="allset_hint_margin_bottom">52dp</dimen>
    <dimen name="allset_subtitle_margin_top">24dp</dimen>

    <!-- All Apps Education tutorial -->
    <dimen name="swipe_edu_padding">8dp</dimen>
    <dimen name="swipe_edu_circle_size">64dp</dimen>
Loading