diff options
-rw-r--r-- | AndroidManifest.xml | 6 | ||||
-rw-r--r-- | res/layout/locale_picker_in_setupwizard.xml | 28 | ||||
-rw-r--r-- | src/com/android/settings/LocalePicker.java | 3 | ||||
-rw-r--r-- | src/com/android/settings/LocalePickerInSetupWizard.java | 43 |
4 files changed, 0 insertions, 80 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b0da109..5f74558 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -231,12 +231,6 @@ </intent-filter> </activity> - <activity android:name="LocalePickerInSetupWizard" android:label="@string/language_picker_title"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity> - <activity android:name="LanguageSettings" android:label="@string/language_keyboard_settings_title" android:clearTaskOnLaunch="true" diff --git a/res/layout/locale_picker_in_setupwizard.xml b/res/layout/locale_picker_in_setupwizard.xml deleted file mode 100644 index e412b07..0000000 --- a/res/layout/locale_picker_in_setupwizard.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:drawSelectorOnTop="false" - /> - -</LinearLayout> diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java index dcd6141..c8548fb 100644 --- a/src/com/android/settings/LocalePicker.java +++ b/src/com/android/settings/LocalePicker.java @@ -23,14 +23,11 @@ import android.app.backup.BackupManager; import android.content.res.Configuration; import android.os.Bundle; import android.os.RemoteException; -import android.os.SystemProperties; import android.util.Log; import android.view.View; import android.widget.ArrayAdapter; import android.widget.ListView; -import java.io.BufferedWriter; -import java.io.FileOutputStream; import java.text.Collator; import java.util.Arrays; import java.util.Locale; diff --git a/src/com/android/settings/LocalePickerInSetupWizard.java b/src/com/android/settings/LocalePickerInSetupWizard.java deleted file mode 100644 index b160e89..0000000 --- a/src/com/android/settings/LocalePickerInSetupWizard.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2007 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.ActivityManagerNative; -import android.app.IActivityManager; -import android.app.ListActivity; -import android.content.res.Configuration; -import android.os.Bundle; -import android.os.RemoteException; -import android.os.SystemProperties; -import android.util.Log; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.ListView; - -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.util.Arrays; -import java.util.Locale; - -public class LocalePickerInSetupWizard extends LocalePicker { - - @Override - int getContentView() { - return R.layout.locale_picker_in_setupwizard; - } - -} |