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

Commit 11d8d5bb authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge changes I1f676efc,I9428c3a3 

* changes:
  Support the feature of Drag to remove for the Accessibility Floating Menu(2/n).
  Support the feature of Drag to remove for the Accessibility Floating Menu(1/n).
parents e8b378a5 e8bff1ea

packages/SystemUI/res/drawable/accessibility_floating_message_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->



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

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

       android:shape="rectangle">

    <solid android:color="@color/accessibility_floating_menu_message_background"/>

    <corners android:radius="28dp"/>

</shape>

packages/SystemUI/res/values-night/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ 


    <!-- Accessibility floating menu -->

    <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->

    <color name="accessibility_floating_menu_message_background">@*android:color/background_material_dark</color>

    <color name="accessibility_floating_menu_message_text">@*android:color/primary_text_default_material_dark</color>



    <color name="people_tile_background">@color/material_dynamic_secondary20</color>

</resources>

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ 
    <!-- Accessibility floating menu -->

    <color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% -->

    <color name="accessibility_floating_menu_stroke_dark">#26FFFFFF</color> <!-- 15% -->

    <color name="accessibility_floating_menu_message_background">@*android:color/background_material_light</color>

    <color name="accessibility_floating_menu_message_text">@*android:color/primary_text_default_material_light</color>



    <!-- Wallet screen -->

    <color name="wallet_card_border">#33FFFFFF</color>

packages/SystemUI/res/values/dimens.xml

+8 −0
Original line number Diff line number Diff line
@@ -1336,6 +1336,14 @@ 
    <dimen name="accessibility_floating_menu_large_single_radius">35dp</dimen>

    <dimen name="accessibility_floating_menu_large_multiple_radius">35dp</dimen>



    <dimen name="accessibility_floating_menu_message_container_horizontal_padding">15dp</dimen>

    <dimen name="accessibility_floating_menu_message_text_vertical_padding">8dp</dimen>

    <dimen name="accessibility_floating_menu_message_margin">8dp</dimen>

    <dimen name="accessibility_floating_menu_message_elevation">5dp</dimen>

    <dimen name="accessibility_floating_menu_message_text_size">14sp</dimen>

    <dimen name="accessibility_floating_menu_message_min_width">312dp</dimen>

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



    <dimen name="accessibility_floating_tooltip_arrow_width">8dp</dimen>

    <dimen name="accessibility_floating_tooltip_arrow_height">16dp</dimen>

    <dimen name="accessibility_floating_tooltip_arrow_margin">-2dp</dimen>

packages/SystemUI/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -2197,6 +2197,15 @@ 
    <string name="accessibility_floating_button_migration_tooltip">Tap to open accessibility features. Customize or replace this button in Settings.\n\n<annotation id="link">View settings</annotation></string>

    <!-- Message for the accessibility floating button docking tooltip. It shows when the user first time drag the button. It will tell the user about docking behavior. [CHAR LIMIT=70] -->

    <string name="accessibility_floating_button_docking_tooltip">Move button to the edge to hide it temporarily</string>

    <!-- Text for the undo action button of the message view of the accessibility floating menu to perform undo operation. [CHAR LIMIT=30]-->

    <string name="accessibility_floating_button_undo">Undo</string>



    <!-- Text for the message view with undo action of the accessibility floating menu to show how many features shortcuts were removed. [CHAR LIMIT=30]-->

    <string name="accessibility_floating_button_undo_message_text">{count, plural,

        =1 {{label} shortcut removed}

        other {# shortcuts removed}

    }</string>



    <!-- Action in accessibility menu to move the accessibility floating button to the top left of the screen. [CHAR LIMIT=30] -->

    <string name="accessibility_floating_button_action_move_top_left">Move top left</string>

    <!-- Action in accessibility menu to move the accessibility floating button to the top right of the screen. [CHAR LIMIT=30] -->