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

Merge "[Settings] Remove the large space when searching language" into udc-dev

Browse Source
This commit is contained in:
Zoey Chen
2023-04-19 05:19:56 +00:00
committed by Android (Google) Code Review
parent 16148bb1bb 7026760615
commit 5614c1e7dc
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
View File

@@ -24,6 +24,8 @@ import android.provider.Settings;
import android.util.Log;
import android.view.MenuItem;
import androidx.core.view.ViewCompat;
import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
import com.android.settings.R;
@@ -35,6 +37,8 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
private static final String TAG = LocalePickerWithRegionActivity.class.getSimpleName();
private static final String PARENT_FRAGMENT_NAME = "localeListEditor";
private LocalePickerWithRegion mSelector;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -49,7 +53,7 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
Log.i(TAG, "Has explicit locales : " + explicitLocales);
}
final LocalePickerWithRegion selector = LocalePickerWithRegion.createLanguagePicker(
mSelector = LocalePickerWithRegion.createLanguagePicker(
this,
LocalePickerWithRegionActivity.this,
false /* translate only */,
@@ -59,7 +63,7 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
getFragmentManager()
.beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.content_frame, selector)
.replace(R.id.content_frame, mSelector)
.addToBackStack(PARENT_FRAGMENT_NAME)
.commit();
}
@@ -102,13 +106,17 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
// To prevent a large space on tool bar.
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
// To prevent user can expand the collpasing tool bar view.
ViewCompat.setNestedScrollingEnabled(mSelector.getListView(), false);
return true;
}
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
ViewCompat.setNestedScrollingEnabled(mSelector.getListView(), true);
return true;
}
}