diff options
author | cretin45 <cretin45@gmail.com> | 2015-03-09 14:49:31 -0700 |
---|---|---|
committer | cretin45 <cretin45@gmail.com> | 2015-03-09 14:49:31 -0700 |
commit | 0d31b31aac79be0d9ffd3fb2d8045be0fa236505 (patch) | |
tree | 3ff5445639f1fd992a6e5ad776d9b88fed812232 /src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java | |
parent | 7732b7485d9dc145ca9093d22cb08259203719d0 (diff) | |
download | packages_apps_SetupWizard-0d31b31aac79be0d9ffd3fb2d8045be0fa236505.zip packages_apps_SetupWizard-0d31b31aac79be0d9ffd3fb2d8045be0fa236505.tar.gz packages_apps_SetupWizard-0d31b31aac79be0d9ffd3fb2d8045be0fa236505.tar.bz2 |
SetupWizard: Refactor for better transitions out of OOBE
Change-Id: If91da3f44dbc5383236b54da529953d48a475250
Diffstat (limited to 'src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java')
-rw-r--r-- | src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java index 1ee4ebb..54f851b 100644 --- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java +++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java @@ -69,8 +69,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks, private final Handler mHandler = new Handler(); - private boolean mIsGuestUser = false; - private volatile boolean mIsFinishing = false; private static long sLaunchTime = 0; @@ -83,7 +81,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks, SetupStats.addEvent(SetupStats.Categories.APP_LAUNCH, TAG); sLaunchTime = System.nanoTime(); } - getWindow().setWindowAnimations(android.R.anim.fade_in); setContentView(R.layout.setup_main); mRootView = findViewById(R.id.root); mReveal = (ImageView)mRootView.findViewById(R.id.reveal); @@ -126,20 +123,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks, return mEnableAccessibilityController.onInterceptTouchEvent(event); } }); - // Since this is a new component, we need to disable here if the user - // has already been through setup on a previous version. - try { - if (Settings.Secure.getInt(getContentResolver(), - Settings.Secure.USER_SETUP_COMPLETE) == 1) { - finalizeSetup(); - } - } catch (Settings.SettingNotFoundException e) { - // Continue with setup - } - mIsGuestUser = SetupWizardUtils.isGuestUser(this); - if (mIsGuestUser) { - finalizeSetup(); - } registerReceiver(mSetupData, mSetupData.getIntentFilter()); } @@ -325,7 +308,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks, @Override public void finish() { super.finish(); - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + overridePendingTransition(R.anim.translucent_enter, R.anim.translucent_exit); } private void setupRevealImage() { |