OSDN Git Service

Use framework onNavigateUp() instead of simply finish().
authorFan Zhang <zhfan@google.com>
Tue, 6 Feb 2018 22:24:18 +0000 (14:24 -0800)
committerFan Zhang <zhfan@google.com>
Wed, 7 Feb 2018 18:50:03 +0000 (10:50 -0800)
commit92a2613353cec71ea390234414ffb8f95a5df01a
tree258c067cbc2975ae3ac732b9f62a30e3c92b9964
parentc65eb444374cd4503d3ee39432ec71ed1d3357e3
Use framework onNavigateUp() instead of simply finish().

- Simply finishing activity bypasses the entire nav-up chain, making
  taskAffinity/parentActivity defined in androidmanifest.xml no-op, which
  is bad.

- Also removed showMenu() logic, this is from drawer era and was only
  needed by mobile settings. We no longer need drawer so this method can
  be removed.

Bug: 72337421
Test: atest

Change-Id: Idee1b72751363b5162887a799197404a9498c83e
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
packages/SettingsLib/tests/integ/src/com/android/settingslib/drawer/SettingsDrawerActivityTest.java