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

Unverified Commit a64c6a53 authored by Jesse Chan's avatar Jesse Chan Committed by Michael Bestas
Browse files

SystemUI: Implement hide gestural navigation hint bar 



Author: Jesse Chan <jc@lineageos.org>
Date:   Tue Jun 2 13:59:52 2020 +0800

    SystemUI: Set no hint overlay to highest priority

    As overlays are also used to apply navigation mode, it is needed to set
    our customization overlay to highest priority to ensure it is applied.

    Change-Id: I41ca4b7ea99fea9f62d2e8ece5114f682e8e7fe9
    Signed-off-by: default avatarJesse Chan <jc@lineageos.org>

Change-Id: Ic6695dfe929db443f169d59f153e14a6de249590
Signed-off-by: default avatarJesse Chan <jc@lineageos.org>
parent f3c09d69

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java

+42 −0
Original line number Diff line number Diff line
@@ -18,13 +18,18 @@ package com.android.systemui.navigationbar; 


import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;



import android.annotation.Nullable;

import android.app.ActivityManager;

import android.content.Context;

import android.content.om.IOverlayManager;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.Log;
@@ -88,6 +93,9 @@ public class NavigationBarInflaterView extends FrameLayout { 
    private static final String ABSOLUTE_SUFFIX = "A";

    private static final String ABSOLUTE_VERTICAL_CENTERED_SUFFIX = "C";



    private static final String OVERLAY_NAVIGATION_HIDE_HINT =

            "org.lineageos.overlay.customization.navbar.nohint";



    private static class Listener implements NavigationModeController.ModeChangedListener {

        private final WeakReference<NavigationBarInflaterView> mSelf;
@@ -126,6 +134,7 @@ public class NavigationBarInflaterView extends FrameLayout { 
    private int mNavBarMode = NAV_BAR_MODE_3BUTTON;



    private boolean mInverseLayout;

    private boolean mIsHintEnabled;



    private final ContentObserver mContentObserver;
@@ -142,6 +151,12 @@ public class NavigationBarInflaterView extends FrameLayout { 
                    mInverseLayout = Settings.Secure.getInt(mContext.getContentResolver(),

                            NAV_BAR_INVERSE, 0) != 0;

                    updateLayoutInversion();

                } else if (LineageSettings.System.getUriFor(

                        LineageSettings.System.NAVIGATION_BAR_HINT).equals(uri)) {

                    mIsHintEnabled = LineageSettings.System.getInt(mContext.getContentResolver(),

                            LineageSettings.System.NAVIGATION_BAR_HINT, 0) != 0;

                    updateHint();

                    onLikelyDefaultLayoutChange();

                }

            }

        };
@@ -181,20 +196,29 @@ public class NavigationBarInflaterView extends FrameLayout { 
                : mOverviewProxyService.shouldShowSwipeUpUI()

                        ? R.string.config_navBarLayoutQuickstep

                        : R.string.config_navBarLayout;

        if (!mIsHintEnabled && defaultResource == R.string.config_navBarLayoutHandle) {

            return getContext().getString(defaultResource).replace(HOME_HANDLE, "");

        }

        return getContext().getString(defaultResource);

    }



    private void onNavigationModeChanged(int mode) {

        mNavBarMode = mode;

        updateHint();

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        Uri navBarInverse = Settings.Secure.getUriFor(NAV_BAR_INVERSE);

        Uri navigationBarHint = LineageSettings.System.getUriFor(

                LineageSettings.System.NAVIGATION_BAR_HINT);

        mContext.getContentResolver().registerContentObserver(navBarInverse, false,

                mContentObserver);

        mContext.getContentResolver().registerContentObserver(navigationBarHint, false,

                mContentObserver);

        mContentObserver.onChange(true, navBarInverse);

        mContentObserver.onChange(true, navigationBarHint);

    }



    @Override
@@ -263,6 +287,24 @@ public class NavigationBarInflaterView extends FrameLayout { 
        }

    }



    private void updateHint() {

        final IOverlayManager iom = IOverlayManager.Stub.asInterface(

                ServiceManager.getService(Context.OVERLAY_SERVICE));

        final boolean state = mNavBarMode == NAV_BAR_MODE_GESTURAL && !mIsHintEnabled;

        final int userId = ActivityManager.getCurrentUser();

        try {

            iom.setEnabled(OVERLAY_NAVIGATION_HIDE_HINT, state, userId);

            if (state) {

                // As overlays are also used to apply navigation mode, it is needed to set

                // our customization overlay to highest priority to ensure it is applied.

                iom.setHighestPriority(OVERLAY_NAVIGATION_HIDE_HINT, userId);

            }

        } catch (IllegalArgumentException | RemoteException e) {

            Log.e(TAG, "Failed to " + (state ? "enable" : "disable")

                    + " overlay " + OVERLAY_NAVIGATION_HIDE_HINT + " for user " + userId);

        }

    }



    private void initiallyFill(ButtonDispatcher buttonDispatcher) {

        addAll(buttonDispatcher, mHorizontal.findViewById(R.id.ends_group));

        addAll(buttonDispatcher, mHorizontal.findViewById(R.id.center_group));