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

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

Merge "Do not show assist affordance when no assistant is available"

parents e0894ab2 add4c398

packages/SystemUI/res/layout/assistant_handle.xml

0 → 100644
+25 −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.phone.NavigationHandle

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

    android:id="@+id/assistant_handle"

    android:layout_width="@dimen/navigation_assistant_handle_width"

    android:layout_height="match_parent"

    android:layout_weight="0"

/>

packages/SystemUI/res/layout/home_handle.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<com.android.systemui.statusbar.phone.NavigationHandle

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

    android:id="@+id/home_handle"

    android:layout_width="@dimen/navigation_handle_width"

    android:layout_width="@dimen/navigation_home_handle_width"

    android:layout_height="match_parent"

    android:layout_weight="0"

    />

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,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">";home_handle;"</string>

    <string name="config_navBarLayoutHandle" translatable="false">";home_handle;assistant_handle[.18WC]"</string>



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

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ 
    <dimen name="navigation_bar_deadzone_size_max">32dp</dimen>



    <!-- dimensions for the navigation bar handle -->

    <dimen name="navigation_handle_width">180dp</dimen>

    <dimen name="navigation_handle_radius">2dp</dimen>

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

    <dimen name="navigation_handle_horizontal_margin">30dp</dimen>

    <dimen name="navigation_home_handle_width">180dp</dimen>

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



    <!-- Height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen>

packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl

+6 −0
Original line number Diff line number Diff line
@@ -113,4 +113,10 @@ oneway interface IOverviewProxy { 
     * Sent when there was an action on one of the onboarding tips view.

     */

    void onTip(int actionType, int viewType) = 10;



    /**

     * Sent when device assistant changes its default assistant whether it is available or not.

     */

    void onAssistantAvailable(boolean available) = 13;



}