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

Commit cdaf56bc authored by Matthew Ng's avatar Matthew Ng
Browse files

Changed navigation handle to be longer and removed assistant handle 

Bug: 112934365
Test: manual
Change-Id: I502fb8cee4f8e6108fd61a709b273677b0afd3de
parent 6b9b10ed

packages/SystemUI/res/layout/assistant_handle.xml

deleted100644 → 0
+0 −25
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/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,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;assistant_handle[.18WC]"</string>

    <string name="config_navBarLayoutHandle" translatable="false">";home_handle;"</string>



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

packages/SystemUI/res/values/dimens.xml

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



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

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

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

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

    <dimen name="navigation_handle_bottom">6dp</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>

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



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

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

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

+0 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ public class NavigationBarInflaterView extends FrameLayout 
    public static final String NAVSPACE = "space";

    public static final String CLIPBOARD = "clipboard";

    public static final String HOME_HANDLE = "home_handle";

    public static final String ASSISTANT_HANDLE = "assistant_handle";

    public static final String KEY = "key";

    public static final String LEFT = "left";

    public static final String RIGHT = "right";
@@ -399,8 +398,6 @@ public class NavigationBarInflaterView extends FrameLayout 
            v = inflater.inflate(R.layout.contextual, parent, false);

        } else if (HOME_HANDLE.equals(button)) {

            v = inflater.inflate(R.layout.home_handle, parent, false);

        } else if (ASSISTANT_HANDLE.equals(button)) {

            v = inflater.inflate(R.layout.assistant_handle, parent, false);

        } else if (button.startsWith(KEY)) {

            String uri = extractImage(button);

            int code = extractKeycode(button);

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

+0 −6
Original line number Diff line number Diff line
@@ -434,7 +434,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        mButtonDispatchers.put(R.id.back, new ButtonDispatcher(R.id.back));

        mButtonDispatchers.put(R.id.home, new ButtonDispatcher(R.id.home));

        mButtonDispatchers.put(R.id.home_handle, new ButtonDispatcher(R.id.home_handle));

        mButtonDispatchers.put(R.id.assistant_handle, new ButtonDispatcher(R.id.assistant_handle));

        mButtonDispatchers.put(R.id.recent_apps, new ButtonDispatcher(R.id.recent_apps));

        mButtonDispatchers.put(R.id.menu, menuButton);

        mButtonDispatchers.put(R.id.ime_switcher, imeSwitcherButton);
@@ -632,10 +631,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        return mButtonDispatchers.get(R.id.home_handle);

    }



    public ButtonDispatcher getAssistantHandle() {

        return mButtonDispatchers.get(R.id.assistant_handle);

    }



    public SparseArray<ButtonDispatcher> getButtonDispatchers() {

        return mButtonDispatchers;

    }
@@ -1002,7 +997,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    // TODO(b/112934365): move this back to NavigationBarFragment when prototype is removed

    private void updateAssistantAvailability() {

        boolean available = mAssistantAvailable && mPrototypeController.isAssistantGestureEnabled();

        getAssistantHandle().setVisibility(available ? View.VISIBLE : View.GONE);

        if (mOverviewProxyService.getProxy() != null) {

            try {

                mOverviewProxyService.getProxy().onAssistantAvailable(available);