Merge "Remove incorrect TODO and meta-data." into mnc-dev
This commit is contained in:
@@ -633,14 +633,11 @@
|
|||||||
android:value="true" />
|
android:value="true" />
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<!-- TODO: This should also be forwarded, but we can't use cross-profile intent filters -->
|
|
||||||
<receiver android:name=".inputmethod.InputMethodDialogReceiver"
|
<receiver android:name=".inputmethod.InputMethodDialogReceiver"
|
||||||
android:enabled="true">
|
android:enabled="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
|
<action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
|
||||||
android:value="true" />
|
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<activity android:name="Settings$UserDictionarySettingsActivity"
|
<activity android:name="Settings$UserDictionarySettingsActivity"
|
||||||
|
Reference in New Issue
Block a user