Automatic translation import

Change-Id: Ic2b7786bf3d0940d5334cc858e72dec0d0d5ad72
Ticket: RM-154

Android.mk

@@ -15,8 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
     play \
-    libphonenumber \
-    org.cyanogenmod.platform.sdk
+    libphonenumber
 
 # Include res dir from chips
 google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res

AndroidManifest.xml

@@ -42,13 +42,12 @@
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_THEME_MANAGER"/>
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" />
+    <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />
     <uses-permission android:name="android.permission.BACKUP" />
     <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
     <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
     <uses-permission android:name="com.cyngn.stats.SEND_ANALYTICS" />
     <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />
-    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
 
     <permission
         android:name="cyanogenmod.permission.PROTECTED_APP"

res/values/config.xml

@@ -21,5 +21,4 @@
          0=default sim image, 1=sim on side, 2=sim on back-->
     <integer name="sim_image_type">0</integer>
     <bool name="check_custom_theme_by_default">true</bool>
-    <string name="default_custom_lockscreen_component"></string>
 </resources>

src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java

@@ -124,14 +124,10 @@ public class CMSetupWizardData extends AbstractSetupData {
     private void showHideSimMissingPage() {
         SimCardMissingPage simCardMissingPage =
                 (SimCardMissingPage) getPage(SimCardMissingPage.TAG);
-        if (simCardMissingPage != null) {
-            if (isSimInserted()) {
-                simCardMissingPage.setHidden(true);
-                if (isCurrentPage(simCardMissingPage)) {
-                    onNextPage();
-                }
-            } else {
-                simCardMissingPage.setHidden(false);
+        if (simCardMissingPage != null && isSimInserted()) {
+            simCardMissingPage.setHidden(true);
+            if (isCurrentPage(simCardMissingPage)) {
+                onNextPage();
             }
         }
     }
@@ -187,8 +183,7 @@ public class CMSetupWizardData extends AbstractSetupData {
                 continue;
             }
             if (state != TelephonyManager.SIM_STATE_ABSENT
-                    && state != TelephonyManager.SIM_STATE_UNKNOWN
-                    && state != TelephonyManager.SIM_STATE_NOT_READY) {
+                    && state != TelephonyManager.SIM_STATE_UNKNOWN) {
                  return true;
             }
         }

src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java

@@ -27,6 +27,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ThemeUtils;
 import android.content.res.ThemeConfig;
 import android.content.res.ThemeManager;
+import android.hardware.CmHardwareManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -36,20 +37,16 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
-import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.IWindowManager;
 import android.view.View;
 import android.view.WindowManagerGlobal;
-import android.view.WindowManagerPolicyControl;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.internal.widget.LockPatternUtils;
-
 import com.cyanogenmod.setupwizard.R;
 import com.cyanogenmod.setupwizard.SetupWizardApp;
 import com.cyanogenmod.setupwizard.cmstats.SetupStats;
@@ -61,8 +58,6 @@ import com.cyanogenmod.setupwizard.util.WhisperPushUtils;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 
-import cyanogenmod.hardware.CMHardwareManager;
-
 public class CyanogenSettingsPage extends SetupPage {
 
     public static final String TAG = "CyanogenSettingsPage";
@@ -108,8 +103,9 @@ public class CyanogenSettingsPage extends SetupPage {
 
         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);
+        final CmHardwareManager cmHardwareManager =
+                (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);
+        cmHardwareManager.set(CmHardwareManager.FEATURE_KEY_DISABLE, enabled);
 
         /* Save/restore button timeouts to disable them in softkey mode */
         SharedPreferences.Editor editor = prefs.edit();
@@ -149,7 +145,6 @@ public class CyanogenSettingsPage extends SetupPage {
         });
         handleEnableMetrics();
         handleDefaultThemeSetup();
-        handleDefaultLockscreenSetup();
     }
 
     private void handleEnableMetrics() {
@@ -178,41 +173,16 @@ public class CyanogenSettingsPage extends SetupPage {
         }
     }
 
-    private void handleDefaultLockscreenSetup() {
-        String defaultLockscreenComponent = mContext.getResources().getString(
-                R.string.default_custom_lockscreen_component);
-        if (!TextUtils.isEmpty(defaultLockscreenComponent)) {
-            ComponentName cn =
-                    ComponentName.unflattenFromString(defaultLockscreenComponent);
-            if (cn != null) {
-                try {
-                    Log.i(TAG, "Applying default lockscreen");
-                    LockPatternUtils util = new LockPatternUtils(mContext);
-                    util.setThirdPartyKeyguard(cn);
-                    disableImmersivePromptForLockscreen(cn);
-                } catch (PackageManager.NameNotFoundException | SecurityException e) {
-                    Log.w(TAG, "Error setting default lockscreen: " + cn, e);
-                }
-            }
-        }
-    }
-
-    private void disableImmersivePromptForLockscreen(ComponentName cn) {
-        // prevents the immersive screen hint for the lockscreen
-        WindowManagerPolicyControl policy = new WindowManagerPolicyControl();
-        policy.reloadFromSetting(mContext);
-        policy.addToPreconfirmWhiteList(cn.getPackageName());
-        policy.saveToSettings(mContext);
-    }
-
     private static boolean hideKeyDisabler(Context ctx) {
-        final CMHardwareManager hardware = CMHardwareManager.getInstance(ctx);
-        return !hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE);
+        final CmHardwareManager cmHardwareManager =
+                (CmHardwareManager) ctx.getSystemService(Context.CMHW_SERVICE);
+        return !cmHardwareManager.isSupported(CmHardwareManager.FEATURE_KEY_DISABLE);
     }
 
     private static boolean isKeyDisablerActive(Context ctx) {
-        final CMHardwareManager hardware = CMHardwareManager.getInstance(ctx);
-        return hardware.get(CMHardwareManager.FEATURE_KEY_DISABLE);
+        final CmHardwareManager cmHardwareManager =
+                (CmHardwareManager) ctx.getSystemService(Context.CMHW_SERVICE);
+        return cmHardwareManager.get(CmHardwareManager.FEATURE_KEY_DISABLE);
     }
 
     private static boolean hideThemeSwitch(Context context) {

src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java

@@ -13,7 +13,7 @@ public class FinishSetupReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (SetupWizardUtils.isDeviceLocked() || SetupWizardUtils.frpEnabled(context)) {
+        if (SetupWizardUtils.isDeviceLocked()) {
             return;
         }
         Settings.Global.putInt(context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);

src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java

@@ -144,9 +144,9 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
         mRootView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                boolean consumeIntercept = mEnableAccessibilityController.onInterceptTouchEvent(event);
-                boolean consumeTouch = mEnableAccessibilityController.onTouchEvent(event);
-                return consumeIntercept && consumeTouch;
+                return
+                    mEnableAccessibilityController.onInterceptTouchEvent(event) &
+                    mEnableAccessibilityController.onTouchEvent(event);
             }
         });
         registerReceiver(mSetupData, mSetupData.getIntentFilter());

src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java

@@ -30,7 +30,6 @@ import android.os.IBinder;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.service.persistentdata.PersistentDataBlockManager;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -143,14 +142,6 @@ public class SetupWizardUtils {
         return false;
     }
 
-    public static boolean frpEnabled(Context context) {
-        final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
-                context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-        return pdbManager != null
-                && pdbManager.getDataBlockSize() > 0
-                && !pdbManager.getOemUnlockEnabled();
-    }
-
     public static boolean hasKillSwitch() {
         IBinder b = ServiceManager.getService(Context.KILLSWITCH_SERVICE);
         IKillSwitchService service = IKillSwitchService.Stub.asInterface(b);