PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maurice Lam
2015-09-29 17:02:43 +00:00
committed by Android (Google) Code Review
parent 6a796dbb94 820ee63716
commit 1556f3c371
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

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

3
res/values/config.xml
View File

@@ -35,7 +35,4 @@
<!-- Carrier_enabled editable --> <!-- Carrier_enabled editable -->
<bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool> <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> </resources>

2
src/com/android/settings/wifi/WifiSetupActivity.java
View File

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