Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

java/AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -83,13 +83,6 @@ 
            android:layout_marginBottom="8dip"

            android:checked="false"

            android:text="@string/research_feedback_include_recording_label" />

        <LinearLayout

            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"
@@ -119,5 +112,4 @@ 
                android:layout_height="wrap_content" />

        </LinearLayout>

    </LinearLayout>

    </LinearLayout>

</ScrollView>

java/res/layout/seek_bar_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"