PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ib9e7b7aa2d36c132c1befefde363c3dc7e7bdcdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-05-11 20:20:26 +00:00
committed by Automerger Merge Worker
parent 6e9fcaa1e3 d375456251
commit a3b5860398
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -38,7 +38,7 @@ import com.android.settings.applications.appinfo.AppLocaleDetails;
import com.android.settings.core.SettingsBaseActivity; import com.android.settings.core.SettingsBaseActivity;
public class AppLocalePickerActivity extends SettingsBaseActivity public class AppLocalePickerActivity extends SettingsBaseActivity
implements LocalePickerWithRegion.LocaleSelectedListener { implements LocalePickerWithRegion.LocaleSelectedListener, MenuItem.OnActionExpandListener {
private static final String TAG = AppLocalePickerActivity.class.getSimpleName(); private static final String TAG = AppLocalePickerActivity.class.getSimpleName();
private String mPackageName; private String mPackageName;
@@ -75,9 +75,10 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker( mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker(
mContextAsUser, mContextAsUser,
AppLocalePickerActivity.this, this,
false /* translate only */, false /* translate only */,
mPackageName); mPackageName,
this);
mAppLocaleDetails = AppLocaleDetails.newInstance(mPackageName); mAppLocaleDetails = AppLocaleDetails.newInstance(mPackageName);
mAppLocaleDetailContainer = launchAppLocaleDetailsPage(); mAppLocaleDetailContainer = launchAppLocaleDetailsPage();
// Launch Locale picker part. // Launch Locale picker part.
@@ -103,6 +104,18 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
finish(); finish();
} }
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
return true;
}
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
return true;
}
/** Sets the app's locale to the supplied language tag */ /** Sets the app's locale to the supplied language tag */
private void setAppDefaultLocale(String languageTag) { private void setAppDefaultLocale(String languageTag) {
LocaleManager localeManager = mContextAsUser.getSystemService(LocaleManager.class); LocaleManager localeManager = mContextAsUser.getSystemService(LocaleManager.class);