Merge "[Settings] Remove dependency from SUW nav bar"

Android.mk

@@ -23,7 +23,6 @@ ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_JACK_ENABLED := incremental
 endif
 
-include frameworks/opt/setupwizard/navigationbar/common.mk
 include frameworks/opt/setupwizard/library/common.mk
 include frameworks/base/packages/SettingsLib/common.mk
 

res/values/config.xml

@@ -35,7 +35,4 @@
     <!-- Carrier_enabled editable -->
     <bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool>
 
-    <!-- The duration (in milliseconds) of activity transitions -->
-    <integer name="setup_wizard_transition_duration">300</integer>
-
 </resources>

src/com/android/settings/wifi/WifiSetupActivity.java

@@ -129,7 +129,7 @@ public class WifiSetupActivity extends WifiPickerActivity
                 // can either connect to a different network or press "next" to proceed.
                 mUserSelectedNetwork = false;
             }
-            setNextButtonText(R.string.setup_wizard_next_button_label);
+            setNextButtonText(R.string.suw_next_button_label);
             setNextButtonEnabled(true);
         } else if (mIsWifiRequired || (mIsNetworkRequired && !isNetworkConnected())) {
             // We do not want the user to skip wifi setting if