Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 7901872 from 6e12a31e5f to sc-v2-release

Browse Source 
Change-Id: I374f3d6cf184788c4ff869c10cf044ed6eaa59b2
This commit is contained in:
Android Build Coastguard Worker
2021-11-11 00:08:26 +00:00
parent dc3a8f2559 6e12a31e5f
commit e06eaea6cc
9 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsActivity.java
View File

@@ -370,8 +370,9 @@ public class SettingsActivity extends SettingsBaseActivity
final SplitStateObserver splitStateObserver = new SplitStateObserver(this /* activity*/, final SplitStateObserver splitStateObserver = new SplitStateObserver(this /* activity*/,
true /* listenOnce */, true /* listenOnce */,
splitInfos -> { splitInfos -> {
if (!splitInfos.isEmpty()) { if (!splitInfos.isEmpty() || !SettingsActivity.this.isTaskRoot()) {
// It's already in 2-pane and no need to go 2-pane deep link flow. // It's already in 2-pane or in a non-empty task, there is no need to go
// 2-pane deep link flow.
return; return;
} }

14
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -29,7 +29,6 @@ import android.os.UserHandle;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import android.view.View; import android.view.View;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -87,6 +86,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
private static final String KEY_PREF_OPTIMIZED = "optimized_pref"; private static final String KEY_PREF_OPTIMIZED = "optimized_pref";
private static final String KEY_PREF_RESTRICTED = "restricted_pref"; private static final String KEY_PREF_RESTRICTED = "restricted_pref";
private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference"; private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference";
private static final String PACKAGE_NAME_NONE = "none";
private static final int REQUEST_UNINSTALL = 0; private static final int REQUEST_UNINSTALL = 0;
private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1; private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1;
@@ -484,14 +484,14 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
} }
if (metricCategory != 0) { if (metricCategory != 0) {
final String packageName = mBatteryOptimizeUtils.getPackageName();
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider() FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
.action( .action(
getContext(), /* attribution */ SettingsEnums.OPEN_APP_BATTERY_USAGE,
metricCategory, /* action */ metricCategory,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, /* pageId */ SettingsEnums.OPEN_APP_BATTERY_USAGE,
mBatteryOptimizeUtils.getPackageName()), TextUtils.isEmpty(packageName) ? PACKAGE_NAME_NONE : packageName,
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
getArguments().getString(EXTRA_POWER_USAGE_PERCENT)));
} }
} }

16
src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
View File

@@ -28,7 +28,6 @@ import android.text.TextUtils;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -65,6 +64,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
ExpandDividerPreference.OnExpandListener { ExpandDividerPreference.OnExpandListener {
private static final String TAG = "BatteryChartPreferenceController"; private static final String TAG = "BatteryChartPreferenceController";
private static final String KEY_FOOTER_PREF = "battery_graph_footer"; private static final String KEY_FOOTER_PREF = "battery_graph_footer";
private static final String PACKAGE_NAME_NONE = "none";
/** Desired battery history size for timestamp slots. */ /** Desired battery history size for timestamp slots. */
public static final int DESIRED_HISTORY_SIZE = 25; public static final int DESIRED_HISTORY_SIZE = 25;
@@ -223,13 +223,13 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
final String packageName = histEntry.mPackageName; final String packageName = histEntry.mPackageName;
final boolean isAppEntry = histEntry.isAppEntry(); final boolean isAppEntry = histEntry.isAppEntry();
mMetricsFeatureProvider.action( mMetricsFeatureProvider.action(
mPrefContext, /* attribution */ SettingsEnums.OPEN_BATTERY_USAGE,
isAppEntry /* action */ isAppEntry
? SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM ? SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM
: SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM, : SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, packageName), /* pageId */ SettingsEnums.OPEN_BATTERY_USAGE,
new Pair(ConvertUtils.METRIC_KEY_BATTERY_LEVEL, histEntry.mBatteryLevel), TextUtils.isEmpty(packageName) ? PACKAGE_NAME_NONE : packageName,
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, powerPref.getPercent())); (int) Math.round(diffEntry.getPercentOfTotal()));
Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s", Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s",
diffEntry.getAppLabel(), histEntry.getKey(), histEntry.mPackageName)); diffEntry.getAppLabel(), histEntry.getKey(), histEntry.mPackageName));
AdvancedPowerUsageDetail.startBatteryDetailPage( AdvancedPowerUsageDetail.startBatteryDetailPage(

2
src/com/android/settings/fuelgauge/BatterySaverController.java
View File

@@ -63,7 +63,7 @@ public class BatterySaverController extends BasePreferenceController
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE; return AVAILABLE;
} }
@Override @Override

8
src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.localepicker; package com.android.settings.localepicker;
import android.app.Activity;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -24,8 +23,11 @@ import android.view.MenuItem;
import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore; import com.android.internal.app.LocaleStore;
import com.android.settings.R;
import com.android.settings.core.SettingsBaseActivity;
public class LocalePickerWithRegionActivity extends Activity /** A activity to show the locale picker page. */
public class LocalePickerWithRegionActivity extends SettingsBaseActivity
implements LocalePickerWithRegion.LocaleSelectedListener { implements LocalePickerWithRegion.LocaleSelectedListener {
private static final String PARENT_FRAGMENT_NAME = "localeListEditor"; private static final String PARENT_FRAGMENT_NAME = "localeListEditor";
@@ -40,7 +42,7 @@ public class LocalePickerWithRegionActivity extends Activity
getFragmentManager() getFragmentManager()
.beginTransaction() .beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(android.R.id.content, selector) .replace(R.id.content_frame, selector)
.addToBackStack(PARENT_FRAGMENT_NAME) .addToBackStack(PARENT_FRAGMENT_NAME)
.commit(); .commit();
} }

8
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -33,9 +33,9 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.helper.SelectableSubscriptions;
import com.android.settings.network.helper.SubscriptionAnnotation; import com.android.settings.network.helper.SubscriptionAnnotation;
import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
@@ -202,6 +202,12 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
|| mStatusCache.isPhysicalSimDisableSupport()) { || mStatusCache.isPhysicalSimDisableSupport()) {
final Intent intent = new Intent(mContext, MobileNetworkActivity.class); final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId()); intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId());
// MobilenetworkActivity is singleTask, set SplitPairRule to show in 2-pane.
ActivityEmbeddingRulesController.registerTwoPanePairRuleForSettingsHome(
mContext,
intent.getComponent(),
null /* secondaryIntentAction */,
false /* clearTop */);
mContext.startActivity(intent); mContext.startActivity(intent);
return true; return true;
} }

9
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -806,12 +806,11 @@ public class AdvancedPowerUsageDetailTest {
verify(mMetricsFeatureProvider) verify(mMetricsFeatureProvider)
.action( .action(
mContext, SettingsEnums.OPEN_APP_BATTERY_USAGE,
SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED, SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED,
(Pair<Integer, Object>[]) new Pair[] { SettingsEnums.OPEN_APP_BATTERY_USAGE,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, null), /* package name*/ "none",
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, "app label") /* consumed battery */ 0);
});
} }
@Test @Test

28
tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
View File

@@ -343,14 +343,12 @@ public final class BatteryChartPreferenceControllerTest {
assertThat(mBatteryChartPreferenceController.handlePreferenceTreeClick( assertThat(mBatteryChartPreferenceController.handlePreferenceTreeClick(
mPowerGaugePreference)).isTrue(); mPowerGaugePreference)).isTrue();
verify(mMetricsFeatureProvider) verify(mMetricsFeatureProvider)
.action( .action(
mContext, SettingsEnums.OPEN_BATTERY_USAGE,
SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM, SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM,
(Pair<Integer, Object>[]) new Pair[] { SettingsEnums.OPEN_BATTERY_USAGE,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, null), /* package name */ "none",
new Pair(ConvertUtils.METRIC_KEY_BATTERY_LEVEL, 0), /* percentage of total */ 0);
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, null)
});
} }
@Test @Test
@@ -362,14 +360,12 @@ public final class BatteryChartPreferenceControllerTest {
assertThat(mBatteryChartPreferenceController.handlePreferenceTreeClick( assertThat(mBatteryChartPreferenceController.handlePreferenceTreeClick(
mPowerGaugePreference)).isTrue(); mPowerGaugePreference)).isTrue();
verify(mMetricsFeatureProvider) verify(mMetricsFeatureProvider)
.action( .action(
mContext, SettingsEnums.OPEN_BATTERY_USAGE,
SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM, SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM,
(Pair<Integer, Object>[]) new Pair[] { SettingsEnums.OPEN_BATTERY_USAGE,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, null), /* package name */ "none",
new Pair(ConvertUtils.METRIC_KEY_BATTERY_LEVEL, 0), /* percentage of total */ 0);
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, null)
});
} }
@Test @Test

6
tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
View File

@@ -117,4 +117,10 @@ public class BatterySaverControllerTest {
assertThat(mBatterySaverController.getSummary()).isEqualTo("Off"); assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
} }
@Test
public void getAvailabilityStatus_returnAvailable() {
assertThat(mBatterySaverController.getAvailabilityStatus())
.isEqualTo(BatterySaverController.AVAILABLE);
}
} }