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

Support DISALLOW_CONFIG_LOCALE user restriction

Browse Source 
Bug: 67586452
Test: make ROBOTEST_FILTER="(LocaleListEditorTest)" RunSettingsRoboTests\
&& make cts && cts-tradefed run cts-dev -m DevicePolicyManager \
-t com.android.cts.devicepolicy.UserRestrictionsTest

Change-Id: I2260b106a111078a62ae7628d6f60e976b70069c
This commit is contained in:
Christine Franks
2017-10-10 15:37:04 -07:00
parent 538f78c839
commit 91dad044cb
5 changed files with 143 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
View File

@@ -82,14 +82,13 @@ class LocaleDragAndDropAdapter
}
public LocaleDragAndDropAdapter(Context context, List<LocaleStore.LocaleInfo> feedItemList) {
this.mFeedItemList = feedItemList;
this.mContext = context;
mFeedItemList = feedItemList;
mContext = context;
final float dragElevation = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,
context.getResources().getDisplayMetrics());
this.mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(
mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(
ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0 /* no swipe */) {
@Override
@@ -248,15 +247,6 @@ class LocaleDragAndDropAdapter
return result;
}
LocaleStore.LocaleInfo getFirstChecked() {
for (LocaleStore.LocaleInfo li : mFeedItemList) {
if (li.getChecked()) {
return li;
}
}
return null;
}
void addLocale(LocaleStore.LocaleInfo li) {
mFeedItemList.add(li);
notifyItemInserted(mFeedItemList.size() - 1);

43
src/com/android/settings/localepicker/LocaleListEditor.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.localepicker;
import android.app.AlertDialog;
import android.app.FragmentTransaction;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.LocaleList;
@@ -30,21 +29,24 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.RestrictedSettingsFragment;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import static android.os.UserManager.DISALLOW_CONFIG_LOCALE;
/**
* Drag-and-drop editor for the user-ordered locale lists.
*/
public class LocaleListEditor extends SettingsPreferenceFragment
public class LocaleListEditor extends RestrictedSettingsFragment
implements LocalePickerWithRegion.LocaleSelectedListener {
private static final String CFGKEY_REMOVE_MODE = "localeRemoveMode";
@@ -56,6 +58,11 @@ public class LocaleListEditor extends SettingsPreferenceFragment
private View mAddLanguage;
private boolean mRemoveMode;
private boolean mShowingRemoveDialog;
private boolean mIsUiRestricted;
public LocaleListEditor() {
super(DISALLOW_CONFIG_LOCALE);
}
@Override
public int getMetricsCategory() {
@@ -68,7 +75,7 @@ public class LocaleListEditor extends SettingsPreferenceFragment
setHasOptionsMenu(true);
LocaleStore.fillCache(this.getContext());
final List<LocaleStore.LocaleInfo> feedsList = getUserLocaleList(this.getContext());
final List<LocaleStore.LocaleInfo> feedsList = getUserLocaleList();
mAdapter = new LocaleDragAndDropAdapter(this.getContext(), feedsList);
}
@@ -81,6 +88,25 @@ public class LocaleListEditor extends SettingsPreferenceFragment
return result;
}
@Override
public void onResume() {
super.onResume();
final boolean previouslyRestricted = mIsUiRestricted;
mIsUiRestricted = isUiRestricted();
final TextView emptyView = getEmptyTextView();
if (mIsUiRestricted && !previouslyRestricted) {
// Lock it down.
emptyView.setText(R.string.language_empty_list_user_restricted);
emptyView.setVisibility(View.VISIBLE);
updateVisibilityOfRemoveMenu();
} else if (!mIsUiRestricted && previouslyRestricted) {
// Unlock it.
emptyView.setVisibility(View.GONE);
updateVisibilityOfRemoveMenu();
}
}
@Override
public void onViewStateRestored(Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
@@ -217,20 +243,18 @@ public class LocaleListEditor extends SettingsPreferenceFragment
updateVisibilityOfRemoveMenu();
}
private static List<LocaleStore.LocaleInfo> getUserLocaleList(Context context) {
private List<LocaleStore.LocaleInfo> getUserLocaleList() {
final List<LocaleStore.LocaleInfo> result = new ArrayList<>();
final LocaleList localeList = LocalePicker.getLocales();
for (int i = 0; i < localeList.size(); i++) {
Locale locale = localeList.get(i);
result.add(LocaleStore.getLocaleInfo(locale));
}
return result;
}
private void configureDragAndDrop(View view) {
final RecyclerView list = (RecyclerView) view.findViewById(R.id.dragList);
final RecyclerView list = view.findViewById(R.id.dragList);
final LocaleLinearLayoutManager llm = new LocaleLinearLayoutManager(getContext(), mAdapter);
llm.setAutoMeasureEnabled(true);
list.setLayoutManager(llm);
@@ -272,7 +296,8 @@ public class LocaleListEditor extends SettingsPreferenceFragment
if (menuItemRemove != null) {
menuItemRemove.setShowAsAction(
mRemoveMode ? MenuItem.SHOW_AS_ACTION_ALWAYS : MenuItem.SHOW_AS_ACTION_NEVER);
menuItemRemove.setVisible(mAdapter.getItemCount() > 1);
final boolean hasMultipleLanguages = mAdapter.getItemCount() > 1;
menuItemRemove.setVisible(hasMultipleLanguages && !mIsUiRestricted);
}
}
}