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

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

Merge changes from topic "accessibility_floating_menu_widget" into sc-dev 

* changes:
  Add new floating action menu for Accessibility targets. (5/n)
  Add new floating action menu for Accessibility targets. (4/n)
  Add new floating action menu for Accessibility targets. (3/n)
  Add new floating action menu for Accessibility targets. (2/n)
  Add new floating action menu for Accessibility targets. (1/n)
parents 6dae2c8f 1b682704

packages/SystemUI/res/drawable/accessibility_floating_menu_background.xml

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

-->



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

       android:shape="rectangle">

    <corners

        android:bottomLeftRadius="@dimen/accessibility_floating_menu_small_single_radius"

        android:bottomRightRadius="0dp"

        android:topLeftRadius="@dimen/accessibility_floating_menu_small_single_radius"

        android:topRightRadius="0dp"/>

    <solid

        android:color="@color/accessibility_floating_menu_background"/>

</shape>

packages/SystemUI/res/layout/accessibility_floating_menu_item.xml

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

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/accessibility_floating_menu_padding"

    android:paddingEnd="@dimen/accessibility_floating_menu_padding"

    android:orientation="vertical"

    android:gravity="center">



    <View

        android:id="@+id/icon_view"

        android:layout_width="@dimen/accessibility_floating_menu_small_width_height"

        android:layout_height="@dimen/accessibility_floating_menu_small_width_height"/>



    <View

        android:id="@+id/transparent_divider"

        android:layout_width="match_parent"

        android:layout_height="@dimen/accessibility_floating_menu_padding"/>



</LinearLayout>
 
 No newline at end of file

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

+2 −0
Original line number Diff line number Diff line
@@ -102,4 +102,6 @@ 
    <color name="privacy_circle_camera">#81C995</color> <!-- g300 -->

    <color name="privacy_circle_microphone_location">#FCAD70</color> <!--o300 -->



    <!-- Accessibility floating menu -->

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

</resources>

packages/SystemUI/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -274,4 +274,8 @@ 
    <!-- TODO(b/178093014) Colors for privacy dialog. These should be changed to the new palette -->

    <color name="privacy_circle_camera">#1E8E3E</color> <!-- g600 -->

    <color name="privacy_circle_microphone_location">#E8710A</color> <!--o600 -->



    <!-- Accessibility floating menu -->

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

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

</resources>

packages/SystemUI/res/values/dimens.xml

+13 −0
Original line number Diff line number Diff line
@@ -1356,6 +1356,19 @@ 
    <dimen name="people_space_image_radius">20dp</dimen>

    <dimen name="people_space_widget_background_padding">6dp</dimen>



    <!-- Accessibility floating menu -->

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

    <dimen name="accessibility_floating_menu_stroke_width">1dp</dimen>

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

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

    <dimen name="accessibility_floating_menu_padding">6dp</dimen>

    <dimen name="accessibility_floating_menu_small_width_height">36dp</dimen>

    <dimen name="accessibility_floating_menu_small_single_radius">25dp</dimen>

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

    <dimen name="accessibility_floating_menu_large_width_height">56dp</dimen>

    <dimen name="accessibility_floating_menu_large_single_radius">33dp</dimen>

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



    <dimen name="rounded_slider_height">44dp</dimen>

    <!-- rounded_slider_height / 2 -->

    <dimen name="rounded_slider_corner_radius">22dp</dimen>