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

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

Merge "Direct launch to web action" into nyc-mr1-dev

parents 20d19a89 2ef1aa58

AndroidManifest.xml

+14 −0
Original line number Original line Diff line number Diff line
@@ -1044,6 +1044,20 @@ 
                android:value="true" />

                android:value="true" />

        </activity>

        </activity>





        <activity android:name="Settings$ManageDomainUrlsActivity"

                  android:taskAffinity="com.android.settings"

                  android:label="@string/domain_urls_title"

                  android:icon="@drawable/ic_settings_memory">

            <intent-filter>

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

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

            </intent-filter>

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

                       android:value="com.android.settings.category.device" />

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

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

        </activity>



        <activity android:name="Settings$MemorySettingsActivity"

        <activity android:name="Settings$MemorySettingsActivity"

                android:label="@string/memory_settings_title"

                android:label="@string/memory_settings_title"

                android:icon="@drawable/ic_settings_memory"

                android:icon="@drawable/ic_settings_memory"

src/com/android/settings/Settings.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ public class Settings extends SettingsActivity { 
    public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }

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

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

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

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

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

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

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





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

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

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

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

src/com/android/settings/SettingsActivity.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ import com.android.settings.applications.DrawOverlayDetails; 
import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.applications.ManageApplications;

import com.android.settings.applications.ManageApplications;

import com.android.settings.applications.ManageAssist;

import com.android.settings.applications.ManageAssist;

import com.android.settings.applications.ManageDomainUrls;

import com.android.settings.applications.NotificationApps;

import com.android.settings.applications.NotificationApps;

import com.android.settings.applications.ProcessStatsSummary;

import com.android.settings.applications.ProcessStatsSummary;

import com.android.settings.applications.ProcessStatsUi;

import com.android.settings.applications.ProcessStatsUi;
@@ -353,6 +354,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
            WifiInfo.class.getName(),

            WifiInfo.class.getName(),

            MasterClear.class.getName(),

            MasterClear.class.getName(),

            NightDisplaySettings.class.getName(),

            NightDisplaySettings.class.getName(),

            ManageDomainUrls.class.getName(),

    };

    };