diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 10:39:05 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 10:39:05 +0100 |
| commit | cf8985887463fbf8236be3b3442ed793aa0085cb (patch) | |
| tree | 346f3560e00779eff5b604e96cd09b936477f700 /src/com/android/settings/SettingsActivity.java | |
| parent | 8084d5f7011d14c8e09fa9428575ce94f07402ef (diff) | |
| parent | bfd3ede27099dbea4ac22e1b9259bc345b53c546 (diff) | |
| download | packages_apps_Settings-cf8985887463fbf8236be3b3442ed793aa0085cb.zip packages_apps_Settings-cf8985887463fbf8236be3b3442ed793aa0085cb.tar.gz packages_apps_Settings-cf8985887463fbf8236be3b3442ed793aa0085cb.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into replicant-6.0
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 27dfc80..332d9b3 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -293,7 +293,8 @@ public class SettingsActivity extends Activity R.id.print_settings, R.id.home_settings, R.id.dashboard, - R.id.privacy_settings_cyanogenmod + R.id.privacy_settings_cyanogenmod, + R.id.button_settings }; private static final String[] ENTRY_FRAGMENTS = { |