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

Commit 5d218d9f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow intent into Privacy Controls page" into tm-dev

parents e22fa138 d1749cfb

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,18 @@ 
                       android:value="true" />

        </activity>



        <activity android:name="Settings$PrivacyControlsActivity"

                  android:label="@string/privacy_controls_title"

                  android:exported="true"

                  android:icon="@drawable/ic_settings_privacy">

            <intent-filter android:priority="1">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.privacy.PrivacyControlsFragment" />

        </activity>



        <activity android:name=".development.tare.TareHomePage"

                  android:label="@string/tare_settings"

                  android:exported="false" />

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ public class Settings extends SettingsActivity { 
            }

        }

    }

    public static class PrivacyControlsActivity extends SettingsActivity { /* empty */ }

    public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }

    public static class FactoryResetActivity extends SettingsActivity {

        @Override

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ import com.android.settings.password.ChooseLockPassword; 
import com.android.settings.password.ChooseLockPattern;

import com.android.settings.print.PrintJobSettingsFragment;

import com.android.settings.print.PrintSettingsFragment;

import com.android.settings.privacy.PrivacyControlsFragment;

import com.android.settings.privacy.PrivacyDashboardFragment;

import com.android.settings.security.LockscreenDashboardFragment;

import com.android.settings.security.SecurityAdvancedSettings;
@@ -218,6 +219,7 @@ public class SettingsGateway { 
            LocationSettings.class.getName(),

            WifiScanningFragment.class.getName(),

            PrivacyDashboardFragment.class.getName(),

            PrivacyControlsFragment.class.getName(),

            LocationServices.class.getName(),

            SecuritySettings.class.getName(),

            SecurityAdvancedSettings.class.getName(),