SUW: rearrange welcome activity

Hide navigation bar and relocate buttons

Change-Id: I0202c18dbcf08bac31707b7b43f10b59d88be7f2

src/org/lineageos/setupwizard/LocaleActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2018,2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@ import android.widget.Toast;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.util.LocaleUtils;
 
+import com.google.android.setupcompat.util.SystemBarHelper;
+
 import org.lineageos.setupwizard.R;
 import org.lineageos.setupwizard.widget.LocalePicker;
 
@@ -78,6 +80,7 @@ public class LocaleActivity extends BaseSetupWizardActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        SystemBarHelper.setBackButtonVisible(getWindow(), true);
         setNextText(R.string.next);
         mLanguagePicker = (LocalePicker) findViewById(R.id.locale_list);
         loadLanguages();

src/org/lineageos/setupwizard/WelcomeActivity.java

@@ -21,6 +21,8 @@ import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.google.android.setupcompat.util.SystemBarHelper;
+
 import org.lineageos.setupwizard.util.EnableAccessibilityController;
 
 public class WelcomeActivity extends BaseSetupWizardActivity {
@@ -33,9 +35,13 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        SystemBarHelper.setBackButtonVisible(getWindow(), false);
         mRootView = findViewById(R.id.setup_wizard_layout);
-        setNextText(R.string.next);
+        setNextText(R.string.start);
         setSkipText(R.string.emergency_call);
+        findViewById(R.id.start).setOnClickListener(view -> onNextPressed());
+        findViewById(R.id.emerg_dialer)
+                .setOnClickListener(view -> startEmergencyDialer());
         mEnableAccessibilityController =
                 EnableAccessibilityController.getInstance(getApplicationContext());
         mRootView.setOnTouchListener((v, event) ->
@@ -46,16 +52,6 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
     @Override
     public void onBackPressed() {}
 
-    @Override
-    public void onSkip() {
-        startEmergencyDialer();
-    }
-
-    @Override
-    public void onNavigateBack() {
-        startEmergencyDialer();
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.welcome_activity;