PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Update for moved force show navbar setting

Browse Source 
Change-Id: I8b883dcc078b314bc209cb5186a49c0e762a47dd
This commit is contained in:
Bruno Martins
2018-09-28 08:50:50 +01:00
parent 33636d146a
commit a8e278d031
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/lineageos/setupwizard/FinishActivity.java
View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2016 The CyanogenMod Project * Copyright (C) 2016 The CyanogenMod Project
* Copyright (C) 2017 The LineageOS Project * Copyright (C) 2017-2018 The LineageOS Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import android.graphics.Bitmap;
import android.graphics.Point; import android.graphics.Point;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.UserHandle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.view.View; import android.view.View;
import android.view.ViewAnimationUtils; import android.view.ViewAnimationUtils;
@@ -210,8 +211,8 @@ public class FinishActivity extends BaseSetupWizardActivity {
private static void writeDisableNavkeysOption(Context context, boolean enabled) { private static void writeDisableNavkeysOption(Context context, boolean enabled) {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
LineageSettings.Global.putInt(context.getContentResolver(), LineageSettings.System.putIntForUser(context.getContentResolver(),
LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0); LineageSettings.System.FORCE_SHOW_NAVBAR, enabled ? 1 : 0, UserHandle.USER_CURRENT);
LineageHardwareManager hardware = LineageHardwareManager.getInstance(context); LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
hardware.set(LineageHardwareManager.FEATURE_KEY_DISABLE, enabled); hardware.set(LineageHardwareManager.FEATURE_KEY_DISABLE, enabled);

5
src/org/lineageos/setupwizard/LineageSettingsActivity.java
View File

@@ -27,6 +27,7 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@@ -190,8 +191,8 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
private void updateDisableNavkeysOption() { private void updateDisableNavkeysOption() {
if (mSupportsKeyDisabler) { if (mSupportsKeyDisabler) {
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
boolean enabled = LineageSettings.Global.getInt(getContentResolver(), boolean enabled = LineageSettings.System.getIntForUser(getContentResolver(),
LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) != 0; LineageSettings.System.FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) != 0;
boolean checked = myPageBundle.containsKey(DISABLE_NAV_KEYS) ? boolean checked = myPageBundle.containsKey(DISABLE_NAV_KEYS) ?
myPageBundle.getBoolean(DISABLE_NAV_KEYS) : myPageBundle.getBoolean(DISABLE_NAV_KEYS) :
enabled; enabled;