Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d384f4c authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fix up-navigation for different levels of Settings screens.

No up affordance for 2-pane screens since there's already
a fragment breadcrumb for navigating up.

Bug: 6452961

Change-Id: Iad9a5c2d0b68cc8f2aec7d5ed8e2ab14d023d48c
parent e5050b1b
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -143,9 +143,11 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
            });
        }

        // TODO Add support for android.R.id.home in all Setting's onOptionsItemSelected
        // getActionBar().setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP,
        // ActionBar.DISPLAY_HOME_AS_UP);
        // Override up navigation for multi-pane, since we handle it in the fragment breadcrumbs
        if (onIsMultiPane()) {
            getActionBar().setDisplayHomeAsUpEnabled(false);
            getActionBar().setHomeButtonEnabled(false);
        }
    }

    @Override
@@ -602,6 +604,10 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
        return true;
    }

    public boolean shouldUpRecreateTask(Intent targetIntent) {
        return super.shouldUpRecreateTask(new Intent(this, Settings.class));
    }

    @Override
    public void setListAdapter(ListAdapter adapter) {
        if (mHeaders == null) {
+6 −0
Original line number Diff line number Diff line
@@ -21,4 +21,10 @@ package com.android.settings;
 * since for our app it is a special singleTask class.
 */
public class SubSettings extends Settings {

    @Override
    public boolean onNavigateUp() {
        finish();
        return true;
    }
}