openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show toolbar back button on subsettings pages am: 6afcfd7cbd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14741513

Change-Id: I5521e29757bb7bf7d0fb8d0774ae84776abb4ba7
This commit is contained in:
Brian Isganitis 2021-06-03 22:39:49 +00:00 committed by Automerger Merge Worker
parent 24cee4fbac 6afcfd7cbd
commit 5980354d54
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java
View File

@ -27,6 +27,7 @@ import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
import static androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra; import static androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra;
import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant; import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
@ -109,6 +110,7 @@ public class SettingsActivityTest {
onView(withText("About")).check(matches(isDisplayed())); onView(withText("About")).check(matches(isDisplayed()));
onView(withText("Version")).check(matches(isDisplayed())); onView(withText("Version")).check(matches(isDisplayed()));
onView(withContentDescription("Navigate up")).check(matches(isDisplayed()));
} }
@Test @Test
@ -119,6 +121,7 @@ public class SettingsActivityTest {
onView(withText("Developer Options")).check(matches(isDisplayed())); onView(withText("Developer Options")).check(matches(isDisplayed()));
onView(withId(R.id.filter_box)).check(matches(isDisplayed())); onView(withId(R.id.filter_box)).check(matches(isDisplayed()));
onView(withContentDescription("Navigate up")).check(matches(isDisplayed()));
} }
@Test @Test
@ -134,4 +137,16 @@ public class SettingsActivityTest {
assertThat(e.getMessage()).contains(fragmentClass); assertThat(e.getMessage()).contains(fragmentClass);
} }
} }
@Test
public void testSettings_backButtonFinishesActivity() {
Bundle fragmentArgs = new Bundle();
fragmentArgs.putString(ARG_PREFERENCE_ROOT, "about_screen");
Intent intent = new Intent(mApplicationContext, SettingsActivity.class)
.putExtra(EXTRA_FRAGMENT_ARGS, fragmentArgs);
ActivityScenario<SettingsActivity> scenario = ActivityScenario.launch(intent);
onView(withContentDescription("Navigate up")).perform(click());
scenario.onActivity(activity -> assertThat(activity.isFinishing()).isTrue());
}
} }

16
src/com/android/launcher3/settings/SettingsActivity.java
View File

@ -24,6 +24,7 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -86,8 +87,12 @@ public class SettingsActivity extends FragmentActivity
setActionBar(findViewById(R.id.action_bar)); setActionBar(findViewById(R.id.action_bar));
WindowCompat.setDecorFitsSystemWindows(getWindow(), false); WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
Intent intent = getIntent();
if (intent.hasExtra(EXTRA_FRAGMENT) || intent.hasExtra(EXTRA_FRAGMENT_ARGS)) {
getActionBar().setDisplayHomeAsUpEnabled(true);
}
if (savedInstanceState == null) { if (savedInstanceState == null) {
Intent intent = getIntent();
Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS); Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS);
if (args == null) { if (args == null) {
args = new Bundle(); args = new Bundle();
@ -164,6 +169,15 @@ public class SettingsActivity extends FragmentActivity
return startPreference(getString(R.string.settings_fragment_name), args, pref.getKey()); return startPreference(getString(R.string.settings_fragment_name), args, pref.getKey());
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
/** /**
* This fragment shows the launcher preferences. * This fragment shows the launcher preferences.
*/ */