Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev (560b8b8a) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2871,6 +2871,19 @@
	android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />		android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />
	</activity>		</activity>

			<!-- Show app-level advanced power usage details (app passed in as extras) -->
			<activity
			android:name=".fuelgauge.AdvancedPowerUsageDetailActivity"
			android:excludeFromRecents="true"
			android:launchMode="singleInstance"
			android:theme="@android:style/Theme.NoDisplay">
			<intent-filter>
			<action android:name="android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" />
			<category android:name="android.intent.category.DEFAULT" />
			<data android:scheme="package" />
			</intent-filter>
			</activity>

	<activity		<activity
	android:name=".Settings$AppAndNotificationDashboardActivity"		android:name=".Settings$AppAndNotificationDashboardActivity"
	android:label="@string/app_and_notification_dashboard_title"		android:label="@string/app_and_notification_dashboard_title"

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -169,7 +169,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
	try {		try {
	args.putInt(EXTRA_UID, packageManager.getPackageUid(packageName, 0 /* no flag */));		args.putInt(EXTRA_UID, packageManager.getPackageUid(packageName, 0 /* no flag */));
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	Log.e(TAG, "Cannot find package: " + packageName, e);		Log.w(TAG, "Cannot find package: " + packageName, e);
	}		}

	new SubSettingLauncher(caller)		new SubSettingLauncher(caller)

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailActivity.java

0 → 100644

+76 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2019 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.fuelgauge;

			import static com.android.settings.fuelgauge.AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME;
			import static com.android.settings.fuelgauge.AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT;
			import static com.android.settings.fuelgauge.AdvancedPowerUsageDetail.EXTRA_UID;

			import android.app.settings.SettingsEnums;
			import android.content.Intent;
			import android.content.pm.PackageManager;
			import android.net.Uri;
			import android.os.Bundle;
			import android.util.Log;

			import androidx.appcompat.app.AppCompatActivity;

			import com.android.settings.core.SubSettingLauncher;
			import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
			import com.android.settings.R;
			import com.android.settings.Utils;

			/**
			* Trampoline activity for launching the {@link AdvancedPowerUsageDetail} fragment.
			*/
			public class AdvancedPowerUsageDetailActivity extends AppCompatActivity {

			private static final String TAG = "AdvancedPowerDetailActivity";

			@Override
			protected void onCreate(Bundle savedInstanceState) {
			super.onCreate(savedInstanceState);
			final Intent intent = getIntent();
			final Uri data = intent == null ? null : intent.getData();
			final String packageName = data == null ? null : data.getSchemeSpecificPart();
			if (packageName != null) {
			final Bundle args = new Bundle(4);
			final PackageManager packageManager = getPackageManager();
			args.putString(EXTRA_PACKAGE_NAME, packageName);
			args.putString(EXTRA_POWER_USAGE_PERCENT, Utils.formatPercentage(0));

			if (intent.getBooleanExtra("request_ignore_background_restriction", false)) {
			args.putString(":settings:fragment_args_key", "background_activity");
			}

			try {
			args.putInt(EXTRA_UID, packageManager.getPackageUid(packageName, 0 /* no flag */));
			} catch (PackageManager.NameNotFoundException e) {
			Log.w(TAG, "Cannot find package: " + packageName, e);
			}

			new SubSettingLauncher(this)
			.setDestination(AdvancedPowerUsageDetail.class.getName())
			.setTitleRes(R.string.battery_details_title)
			.setArguments(args)
			.setSourceMetricsCategory(SettingsEnums.APPLICATIONS_INSTALLED_APP_DETAILS)
			.launch();
			}

			finish();
			}
			}