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

SetupWizard: Temporary compile fixes.

Browse Source 
Change-Id: Iffdbb3b38aef75f14dcb0957df8dda13f844159b
This commit is contained in:
Adnan Begovic
2015-10-14 12:44:53 -07:00
parent f29f92dcac
commit 307e587a3a
6 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
View File

@@ -24,9 +24,9 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ThemeUtils;
/*import android.content.pm.ThemeUtils;
import android.content.res.ThemeConfig;
import android.content.res.ThemeManager;
import android.content.res.ThemeManager;*/
import android.net.Uri;
import android.os.Bundle;
import android.os.RemoteException;
@@ -104,20 +104,20 @@ public class CyanogenSettingsPage extends SetupPage {
private static void writeDisableNavkeysOption(Context context, boolean enabled) {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
final int defaultBrightness = context.getResources().getInteger(
com.android.internal.R.integer.config_buttonBrightnessSettingDefault);
/*final int defaultBrightness = context.getResources().getInteger(
com.android.internal.R.integer.config_buttonBrightnessSettingDefault);*/
Settings.Secure.putInt(context.getContentResolver(),
/*Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
hardware.set(CMHardwareManager.FEATURE_KEY_DISABLE, enabled);
hardware.set(CMHardwareManager.FEATURE_KEY_DISABLE, enabled);*/
/* Save/restore button timeouts to disable them in softkey mode */
SharedPreferences.Editor editor = prefs.edit();
if (enabled) {
int currentBrightness = CMSettings.Secure.getInt(context.getContentResolver(),
CMSettings.Secure.BUTTON_BRIGHTNESS, defaultBrightness);
CMSettings.Secure.BUTTON_BRIGHTNESS, 100);
if (!prefs.contains("pre_navbar_button_backlight")) {
editor.putInt("pre_navbar_button_backlight", currentBrightness);
}
@@ -178,7 +178,7 @@ public class CyanogenSettingsPage extends SetupPage {
}
private void handleDefaultThemeSetup() {
Bundle privacyData = getData();
/*Bundle privacyData = getData();
if (!ThemeUtils.getDefaultThemePackageName(mContext).equals(ThemeConfig.SYSTEM_DEFAULT) &&
privacyData != null && privacyData.getBoolean(KEY_APPLY_DEFAULT_THEME)) {
SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED,
@@ -189,9 +189,9 @@ public class CyanogenSettingsPage extends SetupPage {
final ThemeManager tm = (ThemeManager) mContext.getSystemService(Context.THEME_SERVICE);
tm.applyDefaultTheme();
} else {
} else { */
getCallbacks().finishSetup();
}
//}
}
private static boolean hideKeyDisabler(Context ctx) {
@@ -221,9 +221,9 @@ public class CyanogenSettingsPage extends SetupPage {
SetupWizardUtils.isSimMissing(context));
}
private static boolean hideThemeSwitch(Context context) {
/*private static boolean hideThemeSwitch(Context context) {
return ThemeUtils.getDefaultThemePackageName(context).equals(ThemeConfig.SYSTEM_DEFAULT);
}
}*/
public static class CyanogenSettingsFragment extends SetupPageFragment {
@@ -333,7 +333,7 @@ public class CyanogenSettingsPage extends SetupPage {
mMetrics = (CheckBox) mRootView.findViewById(R.id.enable_metrics_checkbox);
mDefaultThemeRow = mRootView.findViewById(R.id.theme);
mHideThemeRow = hideThemeSwitch(getActivity());
mHideThemeRow = true; // hideThemeSwitch(getActivity());
if (mHideThemeRow) {
mDefaultThemeRow.setVisibility(View.GONE);
} else {
@@ -356,11 +356,11 @@ public class CyanogenSettingsPage extends SetupPage {
mNavKeysRow.setOnClickListener(mNavKeysClickListener);
mNavKeys = (CheckBox) mRootView.findViewById(R.id.nav_keys_checkbox);
boolean needsNavBar = true;
try {
/*try {
IWindowManager windowManager = WindowManagerGlobal.getWindowManagerService();
needsNavBar = windowManager.needsNavigationBar();
} catch (RemoteException e) {
}
}*/
mHideNavKeysRow = hideKeyDisabler(getActivity());
if (mHideNavKeysRow || needsNavBar) {
mNavKeysRow.setVisibility(View.GONE);
@@ -396,7 +396,7 @@ public class CyanogenSettingsPage extends SetupPage {
@Override
public void onResume() {
super.onResume();
updateDisableNavkeysOption();
/*updateDisableNavkeysOption();*/
updateMetricsOption();
updateThemeOption();
updateSmsOption();
@@ -437,7 +437,7 @@ public class CyanogenSettingsPage extends SetupPage {
}
}
private void updateDisableNavkeysOption() {
/*private void updateDisableNavkeysOption() {
if (!mHideNavKeysRow) {
final Bundle myPageBundle = mPage.getData();
boolean enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
@@ -448,7 +448,7 @@ public class CyanogenSettingsPage extends SetupPage {
mNavKeys.setChecked(checked);
myPageBundle.putBoolean(KEY_ENABLE_NAV_KEYS, checked);
}
}
}*/
private static boolean hideKillSwitch() {
return !SetupWizardUtils.hasKillSwitch();