From 820ee637164442a8c3678ec8e5088e8ee2611a6e Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 28 Sep 2015 14:57:20 -0700
Subject: [PATCH] [Settings] Remove dependency from SUW nav bar

Remove setup wizard navigation bar as one of setting's dependencies,
since all the users are using setup wizard library, which includes
the navigation bar as one of its components.

Change-Id: I4ce2b8639155b813a782115725c88d5b1c5c8bfc
---
 Android.mk                                           | 1 -
 res/values/config.xml                                | 3 ---
 src/com/android/settings/wifi/WifiSetupActivity.java | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index 7043ad4b11d..09ce955218b 100644
--- a/Android.mk
+++ b/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
 
diff --git a/res/values/config.xml b/res/values/config.xml
index 295d5d1a425..f96662cd1cc 100755
--- a/res/values/config.xml
+++ b/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>
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 38fc32d3dd1..25f6facd34f 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/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