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

Merge "Remove LocalePickerInSetupWizard."

Browse Source
This commit is contained in:
Daisuke Miyakawa
2010-08-12 12:22:05 -07:00
committed by Android (Google) Code Review
parent ccba07f522 4ced172492
commit 6a3e48c035
4 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -231,12 +231,6 @@
</intent-filter> </intent-filter>
</activity> </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" <activity android:name="LanguageSettings"
android:label="@string/language_keyboard_settings_title" android:label="@string/language_keyboard_settings_title"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"

28
res/layout/locale_picker_in_setupwizard.xml
View File

@@ -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>

3
src/com/android/settings/LocalePicker.java
View File

@@ -23,14 +23,11 @@ import android.app.backup.BackupManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemProperties;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import java.io.BufferedWriter;
import java.io.FileOutputStream;
import java.text.Collator; import java.text.Collator;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;

43
src/com/android/settings/LocalePickerInSetupWizard.java
View File

@@ -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;
}
}