Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix home/back buttons flow in PreferenceActivity."

Browse Source
This commit is contained in:
Filip Pavlis
2017-03-07 19:09:46 +00:00
committed by Android (Google) Code Review
parent 9108ae1a16 6af15ebcfe
commit e88fbbac12
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/preference/PreferenceActivity.java
View File

@@ -40,6 +40,7 @@ import android.util.AttributeSet;
import android.util.TypedValue;
import android.util.Xml;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@@ -75,12 +76,11 @@ import java.util.List;
* however vary; currently there are two major approaches it may take:
*
* <ul>
* <li>On a small screen it may display only the headers as a single list
* when first launched. Selecting one of the header items will re-launch
* the activity with it only showing the PreferenceFragment of that header.
* <li>On a large screen in may display both the headers and current
* PreferenceFragment together as panes. Selecting a header item switches
* to showing the correct PreferenceFragment for that item.
* <li>On a small screen it may display only the headers as a single list when first launched.
* Selecting one of the header items will only show the PreferenceFragment of that header (on
* Android N and lower a new Activity is launched).
* <li>On a large screen in may display both the headers and current PreferenceFragment together as
* panes. Selecting a header item switches to showing the correct PreferenceFragment for that item.
* </ul>
*
* <p>Subclasses of PreferenceActivity should implement
@@ -539,6 +539,16 @@ public abstract class PreferenceActivity extends ListActivity implements
};
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
// Override home navigation button to call onBackPressed (b/35152749).
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);