SetupWizard: Ensure compliance with GMS TOS
* Launches GMS TOS per documentation
* Filters out redundant location page if GMS present
* Uses setupwizardlib for some helper functions
* Hide notification icons
Issue-id: CYNGNOS-2599
Change-Id: I4b59592f0b84d0eb0eafe365eab3bad77c1f76ff
(cherry picked from commit 8109277755
)
This commit is contained in:
@@ -42,6 +42,7 @@ import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ProgressBar;
|
||||
|
||||
import com.android.setupwizardlib.util.SystemBarHelper;
|
||||
import com.cyanogenmod.setupwizard.R;
|
||||
import com.cyanogenmod.setupwizard.SetupWizardApp;
|
||||
import com.cyanogenmod.setupwizard.cmstats.SetupStats;
|
||||
@@ -64,11 +65,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
|
||||
private static final String TAG = SetupWizardActivity.class.getSimpleName();
|
||||
private static final String KEY_LAST_PAGE_TAG = "last_page_tag";
|
||||
|
||||
private static final int UI_FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
|
||||
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
||||
| View.SYSTEM_UI_FLAG_IMMERSIVE
|
||||
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
||||
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
|
||||
|
||||
private View mRootView;
|
||||
private View mButtonBar;
|
||||
@@ -95,25 +91,13 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
|
||||
if (!isOwner) {
|
||||
finish();
|
||||
}
|
||||
final View decorView = getWindow().getDecorView();
|
||||
decorView.setSystemUiVisibility(UI_FLAGS);
|
||||
decorView.setOnSystemUiVisibilityChangeListener(
|
||||
new View.OnSystemUiVisibilityChangeListener() {
|
||||
|
||||
@Override
|
||||
public void onSystemUiVisibilityChange(int visibility) {
|
||||
if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
|
||||
decorView.setSystemUiVisibility(UI_FLAGS);
|
||||
}
|
||||
}
|
||||
});
|
||||
SystemBarHelper.hideSystemBars(getWindow());
|
||||
if (sLaunchTime == 0) {
|
||||
SetupStats.addEvent(SetupStats.Categories.APP_LAUNCH, TAG);
|
||||
sLaunchTime = System.nanoTime();
|
||||
}
|
||||
setContentView(R.layout.setup_main);
|
||||
mRootView = findViewById(R.id.root);
|
||||
mRootView.setSystemUiVisibility(UI_FLAGS);
|
||||
mReveal = (ImageView)mRootView.findViewById(R.id.reveal);
|
||||
mButtonBar = findViewById(R.id.button_bar);
|
||||
mFinishingProgressBar = (ProgressBar)findViewById(R.id.finishing_bar);
|
||||
@@ -186,8 +170,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
final View decorView = getWindow().getDecorView();
|
||||
decorView.setSystemUiVisibility(UI_FLAGS);
|
||||
super.onResume();
|
||||
if (isFinishing()) {
|
||||
return;
|
||||
|
Reference in New Issue
Block a user