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

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

Merge "Added activity with correct filter for DataSaver" into qt-dev

parents de827cb3 d9aadd7d

AndroidManifest.xml

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

        </activity>



        <activity

            android:name="Settings$DataSaverSummaryActivity"

            android:label="@string/data_saver_title"

            android:parentActivityName="Settings">

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

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

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

            </intent-filter>

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

                       android:value="com.android.settings.datausage.DataSaverSummary" />

        </activity>



        <activity

            android:name="Settings$DateTimeSettingsActivity"

            android:label="@string/date_and_time"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class Settings extends SettingsActivity { 
    public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }

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

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

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

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFrag 
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.usb.UsbDetailsFragment;

import com.android.settings.datausage.DataSaverSummary;

import com.android.settings.datausage.DataUsageList;

import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
@@ -163,6 +164,7 @@ public class SettingsGateway { 
            WifiTetherSettings.class.getName(),

            BackgroundCheckSummary.class.getName(),

            VpnSettings.class.getName(),

            DataSaverSummary.class.getName(),

            DateTimeSettings.class.getName(),

            LocaleListEditor.class.getName(),

            AvailableVirtualKeyboardFragment.class.getName(),