diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-26 22:38:14 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-26 22:38:14 +0100 |
| commit | 6cbe985a2162f767843c75859357bbb5906e7c72 (patch) | |
| tree | baece9ced26940c34002de7c292b1cf70d077486 /src/com/android/settings/SettingsActivity.java | |
| parent | 3e7dce5bd266dd87e1d5be52bf66854c8da8f9f1 (diff) | |
| parent | abb68a769f210479fdf84e0b268ce3897281e8a1 (diff) | |
| download | packages_apps_Settings-6cbe985a2162f767843c75859357bbb5906e7c72.zip packages_apps_Settings-6cbe985a2162f767843c75859357bbb5906e7c72.tar.gz packages_apps_Settings-6cbe985a2162f767843c75859357bbb5906e7c72.tar.bz2 | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
res/xml/anonymous_stats.xml
Change-Id: Ie000ecbf14581381ea5a7ebffd35dfd93ee20e76
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b2fc61d..abf300f 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1317,6 +1317,12 @@ public class SettingsActivity extends Activity UserManager.DISALLOW_DEBUGGING_FEATURES)) { removeTile = true; } + } else if (id == R.id.button_settings) { + boolean hasDeviceKeys = getResources().getInteger( + com.android.internal.R.integer.config_deviceHardwareKeys) != 0; + if (!hasDeviceKeys) { + removeTile = true; + } } if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0 |