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

Commit 295a545c authored by Saumya Prakash's avatar Saumya Prakash
Browse files

Enable back gesture on SUW for expressive theme 

According to new spec, for devices that have a different theme, Setup
Wizard should no longer have the back button, and instead should use the
back gesture in between screens.

Fix: 349495243
Flag: EXEMPT bugfix
Test: Set the System property for
setup wizard device theme to be expressive. Rerun setup wizard and
ensure the back gesture works. For the existing theme, the
behavior should remain unchanged.

Change-Id: I26c7ae2b7c10a7dcce1c0556fb6169446600bee2
parent bfa852e0

core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java

+8 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.res.Resources;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.provider.Settings;
@@ -160,7 +161,12 @@ public class GestureNavigationSettingsObserver extends ContentObserver { 
    }



    public boolean areNavigationButtonForcedVisible() {

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

        String SUWTheme = SystemProperties.get("setupwizard.theme", "");

        boolean isExpressiveThemeEnabled = SUWTheme.equals("glif_expressive")

                || SUWTheme.equals("glif_expressive_light");

        // The back gesture is enabled if using the expressive theme

        return !isExpressiveThemeEnabled

                && Settings.Secure.getIntForUser(mContext.getContentResolver(),

                    Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) == 0;

    }