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

Commit c2120ae7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Adds a tooltip for multiple structures" into rvc-dev am: af6a3228 

Change-Id: Ie33581956e644bd3fadffe86379e1f59aed5da63
parents 2d88235e af6a3228

packages/SystemUI/res/layout/controls_onboarding.xml

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

<!--

  ~ Copyright (C) 2020 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_height="wrap_content"

    android:layout_width="wrap_content"

    android:padding="4dp"

    android:orientation="vertical">



    <View

        android:id="@+id/arrow"

        android:elevation="2dp"

        android:layout_width="10dp"

        android:layout_height="8dp"

        android:layout_marginBottom="-2dp"

        android:layout_gravity="center_horizontal"/>



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingStart="24dp"

        android:paddingEnd="4dp"

        android:background="@drawable/recents_onboarding_toast_rounded_background"

        android:layout_gravity="center_horizontal"

        android:elevation="2dp"

        android:orientation="horizontal">



        <TextView

            android:id="@+id/onboarding_text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_gravity="center_vertical"

            android:textColor="?attr/wallpaperTextColor"

            android:textSize="16sp"/>

        <ImageView

            android:id="@+id/dismiss"

            android:layout_width="40dp"

            android:layout_height="40dp"

            android:layout_gravity="center_vertical"

            android:padding="10dp"

            android:layout_marginStart="2dp"

            android:layout_marginEnd="2dp"

            android:alpha="0.7"

            android:src="@drawable/ic_close_white"

            android:tint="?attr/wallpaperTextColor"

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

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

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/controls_structure_page.xml

+3 −10
Original line number Diff line number Diff line
@@ -15,17 +15,10 @@ 
  ~ limitations under the License.

  -->



<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:layout_marginTop="@dimen/controls_management_list_margin">



<androidx.recyclerview.widget.RecyclerView

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

    android:id="@+id/listAll"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    />



</androidx.core.widget.NestedScrollView>
 
 No newline at end of file
 
    android:orientation="vertical"

    android:layout_marginTop="@dimen/controls_management_list_margin"/>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2653,4 +2653,7 @@ 
    <string name="controls_pin_verify">Verify device PIN</string>

    <!-- Controls PIN entry dialog, text hint [CHAR LIMIT=30] -->

    <string name="controls_pin_instructions">Enter PIN</string>



    <!-- Tooltip to show in management screen when there are multiple structures [CHAR_LIMIT=50] -->

    <string name="controls_structure_tooltip">Swipe to see other structures</string>

</resources>

packages/SystemUI/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ 
    <!-- Controls styles -->

    <style name="Theme.ControlsManagement" parent="@android:style/Theme.DeviceDefault.NoActionBar">

        <item name="android:windowIsTranslucent">false</item>

        <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>

    </style>



    <style name="TextAppearance.Control">

packages/SystemUI/src/com/android/systemui/Prefs.java

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ public final class Prefs { 
            Key.TOUCHED_RINGER_TOGGLE,

            Key.HAS_SEEN_ODI_CAPTIONS_TOOLTIP,

            Key.HAS_SEEN_BUBBLES_EDUCATION,

            Key.HAS_SEEN_BUBBLES_MANAGE_EDUCATION

            Key.HAS_SEEN_BUBBLES_MANAGE_EDUCATION,

            Key.CONTROLS_STRUCTURE_SWIPE_TOOLTIP_COUNT

    })

    public @interface Key {

        @Deprecated
@@ -107,6 +108,7 @@ public final class Prefs { 
        String HAS_SEEN_ODI_CAPTIONS_TOOLTIP = "HasSeenODICaptionsTooltip";

        String HAS_SEEN_BUBBLES_EDUCATION = "HasSeenBubblesOnboarding";

        String HAS_SEEN_BUBBLES_MANAGE_EDUCATION = "HasSeenBubblesManageOnboarding";

        String CONTROLS_STRUCTURE_SWIPE_TOOLTIP_COUNT = "ControlsStructureSwipeTooltipCount";

    }



    public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) {