Merge "Remove unused resources"
Tadashi G. Takaoka
Android (Google) Code Review
|
|
@ -49,15 +49,6 @@
|
|||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<activity android:name="com.android.inputmethod.deprecated.languageswitcher.InputLanguageSelection"
|
||||
android:label="@string/language_selection_title">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<action android:name="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<receiver android:name="SuggestionSpanPickedNotificationReceiver" android:enabled="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.text.style.SUGGESTION_PICKED" />
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 970 B |
|
Before Width: | Height: | Size: 795 B |
|
Before Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 398 B |
|
Before Width: | Height: | Size: 309 B |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 982 B |
|
Before Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
|
|
@ -1,25 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2011, 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.
|
||||
*/
|
||||
-->
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:startColor="#ff000000"
|
||||
android:endColor="#ff000e29"
|
||||
android:angle="90" />
|
||||
</shape>
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2011, 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.
|
||||
*/
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:background="@drawable/background_voice">
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/popup_layout"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="371dp"
|
||||
android:layout_width="500dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@drawable/vs_dialog_red">
|
||||
<TextView
|
||||
android:id="@+id/text"
|
||||
android:text="@string/voice_error"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:layout_marginTop="10dp"
|
||||
android:textSize="28sp"
|
||||
android:textColor="#ffffff"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="invisible"/>
|
||||
<RelativeLayout
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="1.0">
|
||||
<com.android.inputmethod.deprecated.voice.SoundIndicator
|
||||
android:id="@+id/sound_indicator"
|
||||
android:src="@drawable/mic_full"
|
||||
android:background="@drawable/mic_base"
|
||||
android:adjustViewBounds="true"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="gone"/>
|
||||
<ImageView
|
||||
android:id="@+id/image"
|
||||
android:src="@drawable/mic_slash"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="visible"/>
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
android:indeterminate="true"
|
||||
android:indeterminateOnly="false"
|
||||
android:layout_height="60dp"
|
||||
android:layout_width="60dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="gone"/>
|
||||
</RelativeLayout>
|
||||
<!--
|
||||
The text is set by the code. We specify a random text (voice_error), so the
|
||||
text view does not have a zero height. This is necessary to keep the slash
|
||||
mic and the recording mic is the same position
|
||||
-->
|
||||
<TextView
|
||||
android:id="@+id/language"
|
||||
android:text="@string/voice_error"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginBottom="3dp"
|
||||
android:layout_gravity="center"
|
||||
android:textColor="#ffffff"
|
||||
android:visibility="invisible"/>
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="54dp"
|
||||
android:singleLine="true"
|
||||
android:focusable="true"
|
||||
android:text="@string/cancel"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:background="@drawable/btn_center"
|
||||
android:textColor="#ffffff"
|
||||
android:textSize="19sp" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2009, 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.
|
||||
*/
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:background="@drawable/background_voice">
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/popup_layout"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="371dp"
|
||||
android:layout_width="500dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@drawable/vs_dialog_red">
|
||||
<TextView
|
||||
android:id="@+id/text"
|
||||
android:text="@string/voice_error"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:layout_marginTop="10dp"
|
||||
android:textSize="20sp"
|
||||
android:textColor="#ffffff"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="invisible"/>
|
||||
<RelativeLayout
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="1.0">
|
||||
<com.android.inputmethod.deprecated.voice.SoundIndicator
|
||||
android:id="@+id/sound_indicator"
|
||||
android:src="@drawable/mic_full"
|
||||
android:background="@drawable/mic_base"
|
||||
android:adjustViewBounds="true"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="gone"/>
|
||||
<ImageView
|
||||
android:id="@+id/image"
|
||||
android:src="@drawable/mic_slash"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="visible"/>
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
android:indeterminate="true"
|
||||
android:indeterminateOnly="false"
|
||||
android:layout_height="60dp"
|
||||
android:layout_width="60dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:visibility="gone"/>
|
||||
</RelativeLayout>
|
||||
<!--
|
||||
The text is set by the code. We specify a random text (voice_error), so the
|
||||
text view does not have a zero height. This is necessary to keep the slash
|
||||
mic and the recording mic is the same position
|
||||
-->
|
||||
<TextView
|
||||
android:id="@+id/language"
|
||||
android:text="@string/voice_error"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textSize="15sp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginBottom="3dp"
|
||||
android:layout_gravity="center"
|
||||
android:textColor="#ffffff"
|
||||
android:visibility="invisible"/>
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="30dp"
|
||||
android:singleLine="true"
|
||||
android:focusable="true"
|
||||
android:text="@string/cancel"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:background="@drawable/btn_center"
|
||||
android:textColor="#ffffff"
|
||||
android:textSize="15sp" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2009, 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="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/keyboard_suggest_strip">
|
||||
|
||||
<!-- TODO: Use dark mic icon. -->
|
||||
<ImageView android:id="@+id/image"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingRight="8dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:src="@drawable/ic_suggest_strip_microphone"
|
||||
/>
|
||||
|
||||
<TextView android:id="@+id/text"
|
||||
android:text="@string/voice_punctuation_hint"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingRight="3dp"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#888888"
|
||||
android:layout_gravity="center_horizontal"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
**
|
||||
** Copyright 2009, 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="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/keyboard_suggest_strip"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingTop="2dp">
|
||||
|
||||
<TextView android:id="@+id/text"
|
||||
android:text="@string/voice_swipe_hint"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:paddingTop="10dp"
|
||||
android:paddingRight="6dp"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#888888"
|
||||
android:layout_gravity="center_horizontal"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:src="@drawable/ic_suggest_strip_microphone"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:src="@drawable/ic_suggest_strip_microphone_swipe"
|
||||
/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2009 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.
|
||||
-->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/language_selection_title">
|
||||
</PreferenceScreen>
|
||||
|
|
@ -32,8 +32,6 @@ public class CompatUtils {
|
|||
// TODO: Can these be constants instead of literal String constants?
|
||||
private static final String INPUT_METHOD_SUBTYPE_SETTINGS =
|
||||
"android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
|
||||
private static final String INPUT_LANGUAGE_SELECTION =
|
||||
"com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION";
|
||||
|
||||
public static Intent getInputLanguageSelectionIntent(String inputMethodId,
|
||||
int flagsForSubtypeSettings) {
|
||||
|
|
@ -51,11 +49,9 @@ public class CompatUtils {
|
|||
if (flagsForSubtypeSettings > 0) {
|
||||
intent.setFlags(flagsForSubtypeSettings);
|
||||
}
|
||||
} else {
|
||||
action = INPUT_LANGUAGE_SELECTION;
|
||||
intent = new Intent(action);
|
||||
return intent;
|
||||
}
|
||||
return intent;
|
||||
throw new RuntimeException("Language selection doesn't supported on this platform");
|
||||
}
|
||||
|
||||
public static Class<?> getClass(String className) {
|
||||
|
|
|
|||