Direct launch to web action am: 2ef1aa5894 am: de2da206af

am: 4de8f3f6bb

Change-Id: I7129d3252f652a4e9fb410229cbfd9c1a7099289
This commit is contained in:
Todd Kennedy
2016-09-09 02:13:11 +00:00
committed by android-build-merger
3 changed files with 17 additions and 1 deletions

View File

@@ -1041,6 +1041,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"

View File

@@ -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 */ }

View File

@@ -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;
@@ -354,6 +355,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(),
}; };