am a381632d: am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev

* commit 'a381632db055eb7cf72a740fb8416315e562ba82': Remove incorrect TODO and meta-data.
2015-06-12 15:36:14 +00:00
parent b52435a963 a381632db0
commit 6816994e85
1 changed files with 0 additions and 3 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -633,14 +633,11 @@
                android:value="true" />
        </activity>

-        <!-- TODO: This should also be forwarded, but we can't use cross-profile intent filters -->
        <receiver android:name=".inputmethod.InputMethodDialogReceiver"
                android:enabled="true">
            <intent-filter>
                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
            </intent-filter>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
        </receiver>

        <activity android:name="Settings$UserDictionarySettingsActivity"