From 257f8c1d0c579e168dd44fc831b5c77efac5b721 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sat, 3 Sep 2016 17:41:48 +0800 Subject: [PATCH] Revert "samsung: doze: Add back button to action bar" Starting N, top-level Settings activities should a drawer menu up on the action bar. Remove the up/back button as it is now obsolete. This reverts commit 5cfd7e76cf8099ebd22f4580cac8ed2217c3ead4. Change-Id: I07af4c08a12bafbef424d01f62521cf226abbc2f --- .../device/TouchscreenGestureSettings.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java index 73914f0..30bbcf4 100644 --- a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java +++ b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java @@ -16,14 +16,11 @@ package com.cyanogenmod.settings.device; -import android.app.ActionBar; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.SwitchPreference; import android.provider.Settings; -import android.view.Menu; -import android.view.MenuItem; import org.cyanogenmod.internal.util.ScreenType; @@ -59,9 +56,6 @@ public class TouchscreenGestureSettings extends PreferenceActivity { mProximityWakePreference = (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); mProximityWakePreference.setOnPreferenceChangeListener(mProximityListener); - - final ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); } @Override @@ -74,15 +68,6 @@ public class TouchscreenGestureSettings extends PreferenceActivity { } } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - return false; - } - private boolean enableDoze(boolean enable) { return Settings.Secure.putInt(getContentResolver(), Settings.Secure.DOZE_ENABLED, enable ? 1 : 0); -- 2.20.1