Skip to content
Snippets Groups Projects
Commit eab4d252 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Remove some warnings"

parents c1f2986a b11339b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 81 deletions
java/AndroidManifest.xml
+ 5
− 3
View file @ eab4d252
......@@ -34,7 +34,8 @@
<application android:label="@string/english_ime_name"
android:icon="@drawable/ic_launcher_keyboard"
android:killAfterRestore="false"
android:supportsRtl="true">
android:supportsRtl="true"
android:allowBackup="true">
<service android:name="LatinIME"
android:label="@string/english_ime_name"
......@@ -110,13 +111,14 @@
</intent-filter>
</receiver>
<receiver android:name=".personalization.DictionaryDecayBroadcastReciever">
<receiver android:name=".personalization.DictionaryDecayBroadcastReciever"
android:exported="false">
<intent-filter>
<action android:name="com.android.inputmethod.latin.personalization.DICT_DECAY" />
</intent-filter>
</receiver>
<receiver android:name=".DictionaryPackInstallBroadcastReceiver">
<receiver android:name=".DictionaryPackInstallBroadcastReceiver" android:exported="false">
<intent-filter>
<action android:name="com.android.inputmethod.dictionarypack.aosp.UNKNOWN_CLIENT" />
</intent-filter>
......
java/res/layout/research_feedback_fragment_layout.xml
+ 24
− 32
View file @ eab4d252
......@@ -84,40 +84,32 @@
android:checked="false"
android:text="@string/research_feedback_include_recording_label" />
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="beginning"
android:dividerPadding="0dip">
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layoutDirection="locale"
android:measureWithLargestChild="true">
<Button
android:id="@+id/research_feedback_cancel_button"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:textSize="14sp"
android:text="@string/research_feedback_cancel"
android:layout_height="wrap_content" />
<Button
android:id="@+id/research_feedback_send_button"
android:layout_width="wrap_content"
android:layout_gravity="right"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:textSize="14sp"
android:text="@string/research_feedback_send"
android:layout_height="wrap_content" />
</LinearLayout>
android:orientation="horizontal"
android:layoutDirection="locale"
android:measureWithLargestChild="true">
<Button
android:id="@+id/research_feedback_cancel_button"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:textSize="14sp"
android:text="@string/research_feedback_cancel"
android:layout_height="wrap_content" />
<Button
android:id="@+id/research_feedback_send_button"
android:layout_width="wrap_content"
android:layout_gravity="right"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:textSize="14sp"
android:text="@string/research_feedback_send"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>
java/res/layout/seek_bar_dialog.xml
+ 1
− 1
View file @ eab4d252
......@@ -33,7 +33,7 @@
<TextView android:id="@+id/seek_bar_dialog_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20dp"/>
android:textSize="20sp"/>
</LinearLayout>
<SeekBar
android:id="@+id/seek_bar_dialog_bar"
......
java/res/layout/setup_steps_title.xml
+ 1
− 3
View file @ eab4d252
......@@ -21,7 +21,5 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:id="@+id/setup_title"
style="@style/setupTitleStyle"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" />
style="@style/setupTitleStyle" />
</merge>
java/res/layout/setup_welcome_title.xml
+ 1
− 3
View file @ eab4d252
......@@ -21,9 +21,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:id="@+id/setup_welcome_title"
style="@style/setupTitleStyle"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" />
style="@style/setupTitleStyle" />
<TextView
android:id="@+id/setup_welcome_description"
android:text="@string/setup_welcome_additional_description"
......
java/res/layout/suggestions_strip.xml
+ 1
− 3
View file @ eab4d252
......@@ -19,9 +19,7 @@
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/suggestions_strip"
android:orientation="horizontal"
......
java/res/layout/user_dictionary_add_word.xml
+ 22
− 31
View file @ eab4d252
......@@ -58,42 +58,33 @@
</EditText>
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="?android:attr/dividerHorizontal"
android:dividerPadding="0dip"
android:orientation="vertical"
android:showDividers="beginning" >
android:measureWithLargestChild="true"
android:orientation="horizontal" >
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
<Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:measureWithLargestChild="true"
android:orientation="horizontal" >
<Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="2"
android:onClick="onClickCancel"
android:text="@string/cancel"
android:textSize="14sp" />
android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="2"
android:onClick="onClickCancel"
android:text="@string/cancel"
android:textSize="14sp" />
<Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="2"
android:onClick="onClickConfirm"
android:text="@string/user_dict_settings_add_dialog_confirm"
android:textSize="14sp" />
</LinearLayout>
<Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="2"
android:onClick="onClickConfirm"
android:text="@string/user_dict_settings_add_dialog_confirm"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
java/res/layout/user_dictionary_item.xml
+ 3
− 2
View file @ eab4d252
......@@ -19,10 +19,11 @@
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingEnd="?android:attr/scrollbarSize" >
android:paddingEnd="?android:attr/scrollbarSize"
android:baselineAligned="false" >
<RelativeLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="6dip"
android:layout_weight="1" >
......
java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java
+ 1
− 1
View file @ eab4d252
......@@ -23,7 +23,7 @@ public final class CommonPreferences {
private static final String COMMON_PREFERENCES_NAME = "LatinImeDictPrefs";
public static SharedPreferences getCommonPreferences(final Context context) {
return context.getSharedPreferences(COMMON_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
return context.getSharedPreferences(COMMON_PREFERENCES_NAME, 0);
}
public static void enable(final SharedPreferences pref, final String id) {
......
java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
+ 1
− 0
View file @ eab4d252
......@@ -100,6 +100,7 @@ public class DictionaryDownloadProgressBar extends ProgressBar {
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
mIsCurrentlyAttachedToWindow = false;
updateReporterThreadRunningStatusAccordingToVisibility();
}
......
java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+ 1
− 1
View file @ eab4d252
......@@ -112,7 +112,7 @@ final public class BinaryDictionaryGetter {
public DictPackSettings(final Context context) {
mDictPreferences = null == context ? null
: context.getSharedPreferences(COMMON_PREFERENCES_NAME,
Context.MODE_WORLD_READABLE | Context.MODE_MULTI_PROCESS);
Context.MODE_MULTI_PROCESS);
}
public boolean isWordListActive(final String dictId) {
if (null == mDictPreferences) {
......
java/src/com/android/inputmethod/latin/RichInputConnection.java
+ 0
− 1
View file @ eab4d252
......@@ -35,7 +35,6 @@ import com.android.inputmethod.latin.utils.StringUtils;
import com.android.inputmethod.latin.utils.TextRange;
import com.android.inputmethod.research.ResearchLogger;
import java.util.Locale;
import java.util.regex.Pattern;
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment