diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | proguard.flags | 2 | ||||
| -rw-r--r-- | res/layout/locale_picker.xml | 10 | ||||
| -rw-r--r-- | src/com/android/settings/LocalePicker.java | 170 | ||||
| -rw-r--r-- | src/com/android/settings/LocalePickerFragment.java | 193 |
5 files changed, 207 insertions, 170 deletions
@@ -8,6 +8,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := Settings LOCAL_CERTIFICATE := platform +LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags + include $(BUILD_PACKAGE) # Use the folloing include to make our test apk. diff --git a/proguard.flags b/proguard.flags new file mode 100644 index 0000000..d37d2e0 --- /dev/null +++ b/proguard.flags @@ -0,0 +1,2 @@ +# Keep all Fragments in this package, which are used by reflection. +-keep class com.android.settings.*Fragment diff --git a/res/layout/locale_picker.xml b/res/layout/locale_picker.xml index cc38278..7fef2ff 100644 --- a/res/layout/locale_picker.xml +++ b/res/layout/locale_picker.xml @@ -19,10 +19,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <ListView android:id="@android:id/list" + <fragment + android:id="@+id/locale_picker_fragment" + android:name="com.android.settings.LocalePickerFragment" android:layout_width="match_parent" - android:layout_height="match_parent" - android:drawSelectorOnTop="false" - /> - + android:layout_height="0dip" + android:layout_weight="1" /> </LinearLayout> diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java index c8548fb..f669712 100644 --- a/src/com/android/settings/LocalePicker.java +++ b/src/com/android/settings/LocalePicker.java @@ -16,173 +16,13 @@ package com.android.settings; -import android.app.ActivityManagerNative; -import android.app.IActivityManager; -import android.app.ListActivity; -import android.app.backup.BackupManager; -import android.content.res.Configuration; +import android.app.Activity; import android.os.Bundle; -import android.os.RemoteException; -import android.util.Log; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.ListView; - -import java.text.Collator; -import java.util.Arrays; -import java.util.Locale; - -public class LocalePicker extends ListActivity { - private static final String TAG = "LocalePicker"; - private static final boolean DEBUG = false; - - Loc[] mLocales; - String[] mSpecialLocaleCodes; - String[] mSpecialLocaleNames; - - private static class Loc implements Comparable { - static Collator sCollator = Collator.getInstance(); - - String label; - Locale locale; - - public Loc(String label, Locale locale) { - this.label = label; - this.locale = locale; - } - - @Override - public String toString() { - return this.label; - } - - public int compareTo(Object o) { - return sCollator.compare(this.label, ((Loc) o).label); - } - } - - int getContentView() { - return R.layout.locale_picker; - } - - @Override - public void onCreate(Bundle icicle) { - super.onCreate(icicle); - setContentView(getContentView()); - - mSpecialLocaleCodes = getResources().getStringArray(R.array.special_locale_codes); - mSpecialLocaleNames = getResources().getStringArray(R.array.special_locale_names); - - String[] locales = getAssets().getLocales(); - Arrays.sort(locales); - - final int origSize = locales.length; - Loc[] preprocess = new Loc[origSize]; - int finalSize = 0; - for (int i = 0 ; i < origSize; i++ ) { - String s = locales[i]; - int len = s.length(); - if (len == 5) { - String language = s.substring(0, 2); - String country = s.substring(3, 5); - Locale l = new Locale(language, country); - - if (finalSize == 0) { - if (DEBUG) { - Log.v(TAG, "adding initial "+ toTitleCase(l.getDisplayLanguage(l))); - } - preprocess[finalSize++] = - new Loc(toTitleCase(l.getDisplayLanguage(l)), l); - } else { - // check previous entry: - // same lang and a country -> upgrade to full name and - // insert ours with full name - // diff lang -> insert ours with lang-only name - if (preprocess[finalSize-1].locale.getLanguage().equals( - language)) { - if (DEBUG) { - Log.v(TAG, "backing up and fixing "+ - preprocess[finalSize-1].label+" to "+ - getDisplayName(preprocess[finalSize-1].locale)); - } - preprocess[finalSize-1].label = toTitleCase( - getDisplayName(preprocess[finalSize-1].locale)); - if (DEBUG) { - Log.v(TAG, " and adding "+ toTitleCase(getDisplayName(l))); - } - preprocess[finalSize++] = - new Loc(toTitleCase(getDisplayName(l)), l); - } else { - String displayName; - if (s.equals("zz_ZZ")) { - displayName = "Pseudo..."; - } else { - displayName = toTitleCase(l.getDisplayLanguage(l)); - } - if (DEBUG) { - Log.v(TAG, "adding "+displayName); - } - preprocess[finalSize++] = new Loc(displayName, l); - } - } - } - } - mLocales = new Loc[finalSize]; - for (int i = 0; i < finalSize ; i++) { - mLocales[i] = preprocess[i]; - } - Arrays.sort(mLocales); - int layoutId = R.layout.locale_picker_item; - int fieldId = R.id.locale; - ArrayAdapter<Loc> adapter = - new ArrayAdapter<Loc>(this, layoutId, fieldId, mLocales); - getListView().setAdapter(adapter); - } - - private static String toTitleCase(String s) { - if (s.length() == 0) { - return s; - } - - return Character.toUpperCase(s.charAt(0)) + s.substring(1); - } - - private String getDisplayName(Locale l) { - String code = l.toString(); - - for (int i = 0; i < mSpecialLocaleCodes.length; i++) { - if (mSpecialLocaleCodes[i].equals(code)) { - return mSpecialLocaleNames[i]; - } - } - - return l.getDisplayName(l); - } - - @Override - public void onResume() { - super.onResume(); - getListView().requestFocus(); - } +public class LocalePicker extends Activity { @Override - protected void onListItemClick(ListView l, View v, int position, long id) { - try { - IActivityManager am = ActivityManagerNative.getDefault(); - Configuration config = am.getConfiguration(); - - Loc loc = mLocales[position]; - config.locale = loc.locale; - - // indicate this isn't some passing default - the user wants this remembered - config.userSetLocale = true; - - am.updateConfiguration(config); - // Trigger the dirty bit for the Settings Provider. - BackupManager.dataChanged("com.android.providers.settings"); - } catch (RemoteException e) { - // Intentionally left blank - } - finish(); + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.locale_picker); } } diff --git a/src/com/android/settings/LocalePickerFragment.java b/src/com/android/settings/LocalePickerFragment.java new file mode 100644 index 0000000..08f43d8 --- /dev/null +++ b/src/com/android/settings/LocalePickerFragment.java @@ -0,0 +1,193 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings; + +import android.app.Activity; +import android.app.ActivityManagerNative; +import android.app.IActivityManager; +import android.app.ListFragment; +import android.app.backup.BackupManager; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.os.Bundle; +import android.os.RemoteException; +import android.util.Log; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.ListView; + +import java.text.Collator; +import java.util.Arrays; +import java.util.Locale; + +public class LocalePickerFragment extends ListFragment { + private static final String TAG = "LocalePickerFragment"; + private static final boolean DEBUG = false; + + Loc[] mLocales; + String[] mSpecialLocaleCodes; + String[] mSpecialLocaleNames; + + Activity mActivity; + + private static class Loc implements Comparable<Loc> { + static Collator sCollator = Collator.getInstance(); + + String label; + Locale locale; + + public Loc(String label, Locale locale) { + this.label = label; + this.locale = locale; + } + + @Override + public String toString() { + return this.label; + } + + @Override + public int compareTo(Loc another) { + return sCollator.compare(this.label, another.label); + } + } + + private void setUpLocaleList() { + final Resources resources = mActivity.getResources(); + mSpecialLocaleCodes = resources.getStringArray(R.array.special_locale_codes); + mSpecialLocaleNames = resources.getStringArray(R.array.special_locale_names); + + final String[] locales = mActivity.getAssets().getLocales(); + Arrays.sort(locales); + final int origSize = locales.length; + Loc[] preprocess = new Loc[origSize]; + int finalSize = 0; + for (int i = 0 ; i < origSize; i++ ) { + String s = locales[i]; + int len = s.length(); + if (len == 5) { + String language = s.substring(0, 2); + String country = s.substring(3, 5); + Locale l = new Locale(language, country); + + if (finalSize == 0) { + if (DEBUG) { + Log.v(TAG, "adding initial "+ toTitleCase(l.getDisplayLanguage(l))); + } + preprocess[finalSize++] = + new Loc(toTitleCase(l.getDisplayLanguage(l)), l); + } else { + // check previous entry: + // same lang and a country -> upgrade to full name and + // insert ours with full name + // diff lang -> insert ours with lang-only name + if (preprocess[finalSize-1].locale.getLanguage().equals( + language)) { + if (DEBUG) { + Log.v(TAG, "backing up and fixing "+ + preprocess[finalSize-1].label+" to "+ + getDisplayName(preprocess[finalSize-1].locale)); + } + preprocess[finalSize-1].label = toTitleCase( + getDisplayName(preprocess[finalSize-1].locale)); + if (DEBUG) { + Log.v(TAG, " and adding "+ toTitleCase(getDisplayName(l))); + } + preprocess[finalSize++] = + new Loc(toTitleCase(getDisplayName(l)), l); + } else { + String displayName; + if (s.equals("zz_ZZ")) { + displayName = "Pseudo..."; + } else { + displayName = toTitleCase(l.getDisplayLanguage(l)); + } + if (DEBUG) { + Log.v(TAG, "adding "+displayName); + } + preprocess[finalSize++] = new Loc(displayName, l); + } + } + } + } + mLocales = new Loc[finalSize]; + for (int i = 0; i < finalSize ; i++) { + mLocales[i] = preprocess[i]; + } + Arrays.sort(mLocales); + final int layoutId = R.layout.locale_picker_item; + final int fieldId = R.id.locale; + final ArrayAdapter<Loc> adapter = + new ArrayAdapter<Loc>(mActivity, layoutId, fieldId, mLocales); + setListAdapter(adapter); + } + + @Override + public void onActivityCreated(final Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + mActivity = getActivity(); + setUpLocaleList(); + } + + private static String toTitleCase(String s) { + if (s.length() == 0) { + return s; + } + + return Character.toUpperCase(s.charAt(0)) + s.substring(1); + } + + private String getDisplayName(Locale l) { + String code = l.toString(); + + for (int i = 0; i < mSpecialLocaleCodes.length; i++) { + if (mSpecialLocaleCodes[i].equals(code)) { + return mSpecialLocaleNames[i]; + } + } + + return l.getDisplayName(l); + } + + @Override + public void onResume() { + super.onResume(); + getListView().requestFocus(); + } + + @Override + public void onListItemClick(ListView l, View v, int position, long id) { + try { + IActivityManager am = ActivityManagerNative.getDefault(); + Configuration config = am.getConfiguration(); + + Loc loc = mLocales[position]; + config.locale = loc.locale; + + // indicate this isn't some passing default - the user wants this remembered + config.userSetLocale = true; + + am.updateConfiguration(config); + // Trigger the dirty bit for the Settings Provider. + BackupManager.dataChanged("com.android.providers.settings"); + } catch (RemoteException e) { + // Intentionally left blank + } + + mActivity.finish(); + } +}
\ No newline at end of file |