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

Commit 136059f1 authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

parents d346fce2 db2c5688

AndroidManifest.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -794,7 +794,6 @@ 
                android:value="com.android.settings.NotificationStation" />

                android:value="com.android.settings.NotificationStation" />

        </activity>

        </activity>





        <!--

        <activity android:name="Settings$AppOpsSummaryActivity"

        <activity android:name="Settings$AppOpsSummaryActivity"

                android:label="@string/app_ops_settings"

                android:label="@string/app_ops_settings"

                android:taskAffinity=""

                android:taskAffinity=""
@@ -803,15 +802,17 @@ 
                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.APP_OPS_SETTINGS" />

                <action android:name="android.settings.APP_OPS_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <!-- Not yet ready to expose.

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

                <category android:name="com.android.settings.SHORTCUT" />

                -->

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.AppOpsSummary" />

                android:value="com.android.settings.applications.AppOpsSummary" />

            <!--

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/application_settings" />

                android:resource="@id/application_settings" /> -->

        </activity>

        </activity>

        -->

        

        

        <activity android:name="Settings$LocationSettingsActivity"

        <activity android:name="Settings$LocationSettingsActivity"

                android:label="@string/location_settings_title"

                android:label="@string/location_settings_title"