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

Commit 7ce70a00 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Add rotate suggestion button to gestural nav. am: efc34667" into qt-dev-plus-aosp

parents b97f906f 6963cad2

packages/SystemUI/res/layout/contextual.xml

+4 −10
Original line number Diff line number Diff line
@@ -42,16 +42,10 @@ 
        android:layout_height="match_parent"

        android:visibility="invisible"

    />

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/rotate_suggestion"

    <include layout="@layout/rotate_suggestion"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

        android:layout_weight="0"

        android:scaleType="center"

             android:visibility="invisible"

        android:contentDescription="@string/accessibility_rotate_button"

        android:paddingStart="@dimen/navigation_key_padding"

        android:paddingEnd="@dimen/navigation_key_padding"

    />

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/accessibility_button"

packages/SystemUI/res/layout/rotate_suggestion.xml

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

<!--

  ~ Copyright (C) 2019 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

  -->



<com.android.systemui.statusbar.policy.KeyButtonView

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

    android:id="@+id/rotate_suggestion"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_weight="0"

    android:scaleType="center"

    android:visibility="invisible"

    android:contentDescription="@string/accessibility_rotate_button"

    android:paddingStart="@dimen/navigation_key_padding"

    android:paddingEnd="@dimen/navigation_key_padding"

/>
 
 No newline at end of file

packages/SystemUI/res/layout/start_contextual.xml

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

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

-->

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

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

             android:id="@+id/start_menu_container"

             android:layout_width="@dimen/navigation_key_width"

             android:layout_height="match_parent"

             android:importantForAccessibility="no"

             android:focusable="false"

             android:clipChildren="false"

             android:clipToPadding="false"

             >

    <include layout="@layout/rotate_suggestion"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:visibility="invisible"

    />

    <include layout="@layout/back"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:visibility="invisible"

    />

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ 
    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string>

    <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;contextual[1.7WC]</string>

    <string name="config_navBarLayoutHandle" translatable="false">back[1.7WC];home_handle;ime_switcher[1.7WC]</string>

    <string name="config_navBarLayoutHandle" translatable="false">start_contextual[.1WC];home_handle;ime_switcher[.1WC]</string>



    <bool name="quick_settings_show_full_alarm">false</bool>

packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class ButtonDispatcher { 
    private Boolean mLongClickable;

    private Float mAlpha;

    private Float mDarkIntensity;

    private Integer mVisibility = -1;

    private Integer mVisibility = View.VISIBLE;

    private Boolean mDelayTouchFeedback;

    private KeyButtonDrawable mImageDrawable;

    private View mCurrentView;
@@ -86,7 +86,7 @@ public class ButtonDispatcher { 
        if (mAlpha != null) {

            view.setAlpha(mAlpha);

        }

        if (mVisibility != null && mVisibility != -1) {

        if (mVisibility != null) {

            view.setVisibility(mVisibility);

        }

        if (mAccessibilityDelegate != null) {