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

Commit 9cfd6e77 authored by Saumya Prakash's avatar Saumya Prakash Committed by Android (Google) Code Review
Browse files

Merge "Enable back gesture on SUW for expressive theme" into main

parents bd53bc80 295a545c

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

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

import android.content.res.Resources;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.Handler;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;

import android.provider.Settings;

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

    }





    public boolean areNavigationButtonForcedVisible() {

    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;

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

    }

    }