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

SUW: Update for LineageOS platform & sdk

Browse Source 
Change-Id: Idb765ea4808b4ba3c01414974e40ccf735f77f9d
This commit is contained in:
Abhisek Devkota
2018-01-29 12:41:42 -08:00
parent e0605c03f4
commit cc839c9d87
7 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@@ -16,8 +16,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \ android-support-v4 \
android-support-v13 \ android-support-v13 \
libphonenumber \ libphonenumber \
org.cyanogenmod.platform.internal \ org.lineageos.platform.internal \
org.cyanogenmod.platform.sdk org.lineageos.platform.sdk
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
telephony-common telephony-common

9
AndroidManifest.xml
View File

@@ -39,12 +39,12 @@
<uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" /> <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" /> <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
<uses-permission android:name="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" /> <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
<uses-permission android:name="android.permission.BACKUP" /> <uses-permission android:name="android.permission.BACKUP" />
<uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" /> <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
<uses-permission android:name="cyanogenmod.permission.LEGALESE" /> <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
<uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS"/> <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
<uses-permission android:name="cyanogenmod.permission.WRITE_SECURE_SETTINGS"/> <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
<permission <permission
android:name="cyanogenmod.permission.PROTECTED_APP" android:name="cyanogenmod.permission.PROTECTED_APP"
@@ -52,8 +52,7 @@
<permission <permission
android:name="cyanogenmod.permission.FINISH_SETUP" android:name="cyanogenmod.permission.FINISH_SETUP"
android:protectionLevel="signatureOrSystem" android:protectionLevel="signatureOrSystem" />
androidprv:allowViaWhitelist="true" />
<protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED" <protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
android:permission="cyanogenmod.permission.FINISH_SETUP"/> android:permission="cyanogenmod.permission.FINISH_SETUP"/>

32
src/com/cyanogenmod/setupwizard/FinishActivity.java
View File

@@ -47,8 +47,8 @@ import com.android.setupwizardlib.util.WizardManagerHelper;
import com.cyanogenmod.setupwizard.util.EnableAccessibilityController; import com.cyanogenmod.setupwizard.util.EnableAccessibilityController;
import cyanogenmod.hardware.CMHardwareManager; import lineageos.hardware.LineageHardwareManager;
import cyanogenmod.providers.CMSettings; import lineageos.providers.LineageSettings;
public class FinishActivity extends BaseSetupWizardActivity { public class FinishActivity extends BaseSetupWizardActivity {
@@ -189,8 +189,8 @@ public class FinishActivity extends BaseSetupWizardActivity {
Bundle privacyData = setupWizardApp.getSettingsBundle(); Bundle privacyData = setupWizardApp.getSettingsBundle();
if (privacyData != null if (privacyData != null
&& privacyData.containsKey(KEY_SEND_METRICS)) { && privacyData.containsKey(KEY_SEND_METRICS)) {
CMSettings.Secure.putInt(setupWizardApp.getContentResolver(), LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
CMSettings.Secure.STATS_COLLECTION, privacyData.getBoolean(KEY_SEND_METRICS) LineageSettings.Secure.STATS_COLLECTION, privacyData.getBoolean(KEY_SEND_METRICS)
? 1 : 0); ? 1 : 0);
} }
} }
@@ -198,8 +198,8 @@ public class FinishActivity extends BaseSetupWizardActivity {
private static void handlePrivacyGuard(SetupWizardApp setupWizardApp) { private static void handlePrivacyGuard(SetupWizardApp setupWizardApp) {
Bundle mPrivacyData = setupWizardApp.getSettingsBundle(); Bundle mPrivacyData = setupWizardApp.getSettingsBundle();
if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) { if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {
CMSettings.Secure.putInt(setupWizardApp.getContentResolver(), LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
CMSettings.Secure.PRIVACY_GUARD_DEFAULT, LineageSettings.Secure.PRIVACY_GUARD_DEFAULT,
mPrivacyData.getBoolean(KEY_PRIVACY_GUARD) ? 1 : 0); mPrivacyData.getBoolean(KEY_PRIVACY_GUARD) ? 1 : 0);
} }
} }
@@ -214,22 +214,22 @@ 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);
CMSettings.Global.putInt(context.getContentResolver(), LineageSettings.Global.putInt(context.getContentResolver(),
CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0); LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
CMHardwareManager hardware = CMHardwareManager.getInstance(context); LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
hardware.set(CMHardwareManager.FEATURE_KEY_DISABLE, enabled); hardware.set(LineageHardwareManager.FEATURE_KEY_DISABLE, enabled);
/* Save/restore button timeouts to disable them in softkey mode */ /* Save/restore button timeouts to disable them in softkey mode */
if (enabled) { if (enabled) {
CMSettings.Secure.putInt(context.getContentResolver(), LineageSettings.Secure.putInt(context.getContentResolver(),
CMSettings.Secure.BUTTON_BRIGHTNESS, 0); LineageSettings.Secure.BUTTON_BRIGHTNESS, 0);
} else { } else {
int currentBrightness = CMSettings.Secure.getInt(context.getContentResolver(), int currentBrightness = LineageSettings.Secure.getInt(context.getContentResolver(),
CMSettings.Secure.BUTTON_BRIGHTNESS, 100); LineageSettings.Secure.BUTTON_BRIGHTNESS, 100);
int oldBright = prefs.getInt(KEY_BUTTON_BACKLIGHT, int oldBright = prefs.getInt(KEY_BUTTON_BACKLIGHT,
currentBrightness); currentBrightness);
CMSettings.Secure.putInt(context.getContentResolver(), LineageSettings.Secure.putInt(context.getContentResolver(),
CMSettings.Secure.BUTTON_BRIGHTNESS, oldBright); LineageSettings.Secure.BUTTON_BRIGHTNESS, oldBright);
} }
} }
} }

24
src/com/cyanogenmod/setupwizard/LineageSettingsActivity.java
View File

@@ -46,8 +46,8 @@ import com.android.setupwizardlib.util.WizardManagerHelper;
import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.R;
import cyanogenmod.hardware.CMHardwareManager; import lineageos.hardware.LineageHardwareManager;
import cyanogenmod.providers.CMSettings; import lineageos.providers.LineageSettings;
public class LineageSettingsActivity extends BaseSetupWizardActivity { public class LineageSettingsActivity extends BaseSetupWizardActivity {
@@ -155,8 +155,8 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
mPrivacyGuardRow = findViewById(R.id.privacy_guard); mPrivacyGuardRow = findViewById(R.id.privacy_guard);
mPrivacyGuardRow.setOnClickListener(mPrivacyGuardClickListener); mPrivacyGuardRow.setOnClickListener(mPrivacyGuardClickListener);
mPrivacyGuard = (CheckBox) findViewById(R.id.privacy_guard_checkbox); mPrivacyGuard = (CheckBox) findViewById(R.id.privacy_guard_checkbox);
mPrivacyGuard.setChecked(CMSettings.Secure.getInt(getContentResolver(), mPrivacyGuard.setChecked(LineageSettings.Secure.getInt(getContentResolver(),
CMSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1); LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1);
} }
@Override @Override
@@ -210,8 +210,8 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
private void updateDisableNavkeysOption() { private void updateDisableNavkeysOption() {
if (!mHideNavKeysRow) { if (!mHideNavKeysRow) {
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
boolean enabled = CMSettings.Secure.getInt(getContentResolver(), boolean enabled = LineageSettings.Secure.getInt(getContentResolver(),
CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0; LineageSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 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;
@@ -222,8 +222,8 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
private void updatePrivacyGuardOption() { private void updatePrivacyGuardOption() {
final Bundle bundle = mSetupWizardApp.getSettingsBundle(); final Bundle bundle = mSetupWizardApp.getSettingsBundle();
boolean enabled = CMSettings.Secure.getInt(getContentResolver(), boolean enabled = LineageSettings.Secure.getInt(getContentResolver(),
CMSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) != 0; LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) != 0;
boolean checked = bundle.containsKey(KEY_PRIVACY_GUARD) ? boolean checked = bundle.containsKey(KEY_PRIVACY_GUARD) ?
bundle.getBoolean(KEY_PRIVACY_GUARD) : bundle.getBoolean(KEY_PRIVACY_GUARD) :
enabled; enabled;
@@ -232,12 +232,12 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
} }
private static boolean hideKeyDisabler(Context context) { private static boolean hideKeyDisabler(Context context) {
final CMHardwareManager hardware = CMHardwareManager.getInstance(context); final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
return !hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE); return !hardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE);
} }
private static boolean isKeyDisablerActive(Context context) { private static boolean isKeyDisablerActive(Context context) {
final CMHardwareManager hardware = CMHardwareManager.getInstance(context); final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
return hardware.get(CMHardwareManager.FEATURE_KEY_DISABLE); return hardware.get(LineageHardwareManager.FEATURE_KEY_DISABLE);
} }
} }

18
src/com/cyanogenmod/setupwizard/util/EnableAccessibilityController.java
View File

@@ -58,18 +58,19 @@ public class EnableAccessibilityController {
public void handleMessage(Message message) { public void handleMessage(Message message) {
switch (message.what) { switch (message.what) {
case MESSAGE_SPEAK_WARNING: { case MESSAGE_SPEAK_WARNING: {
String text = mContext.getString(R.string.continue_to_enable_accessibility); // TODO: Fix these or remove these
mTts.speak(text, TextToSpeech.QUEUE_FLUSH, null); //String text = mContext.getString(R.string.continue_to_enable_accessibility);
//mTts.speak(text, TextToSpeech.QUEUE_FLUSH, null);
} break; } break;
case MESSAGE_SPEAK_ENABLE_CANCELED: { case MESSAGE_SPEAK_ENABLE_CANCELED: {
String text = mContext.getString(R.string.enable_accessibility_canceled); //String text = mContext.getString(R.string.enable_accessibility_canceled);
mTts.speak(text, TextToSpeech.QUEUE_FLUSH, null); //mTts.speak(text, TextToSpeech.QUEUE_FLUSH, null);
} break; } break;
case MESSAGE_ENABLE_ACCESSIBILITY: { case MESSAGE_ENABLE_ACCESSIBILITY: {
enableAccessibility(); enableAccessibility();
mTone.play(); //mTone.play();
mTts.speak(mContext.getString(R.string.accessibility_enabled), //mTts.speak(mContext.getString(R.string.accessibility_enabled),
TextToSpeech.QUEUE_FLUSH, null); // TextToSpeech.QUEUE_FLUSH, null);
} break; } break;
} }
} }
@@ -261,9 +262,6 @@ public class EnableAccessibilityController {
Settings.Secure.putIntForUser(resolver, Settings.Secure.TOUCH_EXPLORATION_ENABLED, Settings.Secure.putIntForUser(resolver, Settings.Secure.TOUCH_EXPLORATION_ENABLED,
1, userId); 1, userId);
} }
// Enable accessibility script injection (AndroidVox) for web content.
Settings.Secure.putIntForUser(resolver, Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION,
1, userId);
// Turn on accessibility mode last. // Turn on accessibility mode last.
Settings.Secure.putIntForUser(resolver, Settings.Secure.ACCESSIBILITY_ENABLED, Settings.Secure.putIntForUser(resolver, Settings.Secure.ACCESSIBILITY_ENABLED,
1, userId); 1, userId);

4
src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
View File

@@ -63,12 +63,12 @@ import com.cyanogenmod.setupwizard.SimMissingActivity;
import com.cyanogenmod.setupwizard.WifiSetupActivity; import com.cyanogenmod.setupwizard.WifiSetupActivity;
import com.cyanogenmod.setupwizard.wizardmanager.WizardManager; import com.cyanogenmod.setupwizard.wizardmanager.WizardManager;
import org.cyanogenmod.internal.util.PackageManagerUtils; import org.lineageos.internal.util.PackageManagerUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import cyanogenmod.providers.CMSettings; import lineageos.providers.LineageSettings;
public class SetupWizardUtils { public class SetupWizardUtils {

2
tests/Android.mk
View File

@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_PRIVILEGED_MODULE := true LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
org.cyanogenmod.platform.sdk org.lineageos.platform.sdk
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)