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

Commit 2594b932 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Changed intents for data and saver tiles 

Changed the intents to point to the right settings. The intent in
CellularTile will point to the carrier selected as default for data if
there is one.

Test: manual, using DSDS
Fixes: 122676059
Change-Id: I71a8eac1754eaadda156209315a3a469e7e4f6d0
parent 9dfc48d0

core/java/android/provider/Settings.java

+16 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,22 @@ public final class Settings { 
    public static final String ACTION_ADD_ACCOUNT =

            "android.settings.ADD_ACCOUNT_SETTINGS";













    /**













     * Activity Action: Show settings for enabling or disabling data saver













     * <p></p>













     * In some cases, a matching Activity may not exist, so ensure you













     * safeguard against this.













     * <p>













     * Input: Nothing.













     * <p>













     * Output: Nothing.













     *













     * @hide













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_DATA_SAVER_SETTINGS =













            "android.settings.DATA_SAVER_SETTINGS";



























    /**















     * Activity Action: Show settings for selecting the network operator.















     * <p>

































packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java



+8
−1




























Original line number
Diff line number
Diff line








@@ -25,6 +25,7 @@ import android.content.Intent;













import android.content.res.Resources;















import android.provider.Settings;















import android.service.quicksettings.Tile;













import android.telephony.SubscriptionManager;















import android.text.TextUtils;















import android.view.LayoutInflater;















import android.view.View;










@@ -285,7 +286,13 @@ public class CellularTile extends QSTileImpl<SignalState> {













    }































    static Intent getCellularSettingIntent() {













        return new Intent(Settings.ACTION_DATA_USAGE_SETTINGS);













        Intent intent = new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS);













        int dataSub = SubscriptionManager.getDefaultDataSubscriptionId();













        if (dataSub != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {













            intent.putExtra(Settings.EXTRA_SUB_ID,













                    SubscriptionManager.getDefaultDataSubscriptionId());













        }













        return intent;















    }































    private final class CellularDetailAdapter implements DetailAdapter {

































packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@ package com.android.systemui.qs.tiles;





























import android.content.DialogInterface.OnClickListener;















import android.content.Intent;













import android.provider.Settings;















import android.service.quicksettings.Tile;















import android.widget.Switch;


























@@ -54,7 +55,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements





























    @Override















    public Intent getLongClickIntent() {













        return CellularTile.getCellularSettingIntent();













        return new Intent(Settings.ACTION_DATA_SAVER_SETTINGS);















    }















    @Override















    protected void handleClick() {