PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ApplicationsState to SettingsLib

Browse Source 
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings

b/21328967

Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
This commit is contained in:
Tony Mantler
2015-06-08 14:41:02 -07:00
parent 7e38eea817
commit 67cd6ab93a
18 changed files with 40 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -4,6 +4,9 @@
coreApp="true"
android:sharedUserId="android.uid.system">
<uses-sdk
android:minSdkVersion="21" />
<original-package android:name="com.android.settings" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

9
src/com/android/settings/Utils.java
View File

@@ -16,8 +16,6 @@
package com.android.settings;
import static android.content.Intent.EXTRA_USER;
import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
@@ -70,8 +68,6 @@ import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
import android.service.persistentdata.PersistentDataBlockManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@@ -87,20 +83,21 @@ import android.widget.TabWidget;
import com.android.internal.util.UserIcons;
import com.android.settings.UserAdapter.UserDetails;
import com.android.settings.applications.ApplicationsState;
import com.android.settings.dashboard.DashboardTile;
import com.android.settings.drawable.CircleFramedDrawable;
import com.android.settingslib.applications.ApplicationsState;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import static android.content.Intent.EXTRA_USER;
public final class Utils {
private static final String TAG = "Settings";

5
src/com/android/settings/applications/AdvancedAppSettings.java
View File

@@ -23,10 +23,11 @@ import android.preference.Preference;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.Session;
import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
import com.android.settings.fuelgauge.PowerWhitelistBackend;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.Session;
import java.util.ArrayList;

3
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -38,7 +38,8 @@ import android.util.Log;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import java.util.ArrayList;

236
src/com/android/settings/applications/AppPermissionSettings.java
View File

@@ -1,236 +0,0 @@
/*
* Copyright (C) 2015 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.applications;
import android.app.AlertDialog;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AppSecurityPermissions;
import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.telephony.ISms;
import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.ApplicationsState.AppEntry;
import java.util.ArrayList;
public class AppPermissionSettings extends AppInfoWithHeader {
private ISms mSmsManager;
private View mRootView;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.permission_settings, container, false);
final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
Utils.forceCustomPadding(allDetails, true /* additive padding */);
mRootView = view;
return view;
}
@Override
protected boolean refreshUi() {
retrieveAppEntry();
// Security permissions section
LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), mPackageName);
int premiumSmsPermission = getPremiumSmsPermission(mPackageName);
// Premium SMS permission implies the app also has SEND_SMS permission, so the original
// application permissions list doesn't have to be shown/hidden separately. The premium
// SMS subsection should only be visible if the app has tried to send to a premium SMS.
if (asp.getPermissionCount() > 0
|| premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
permsView.setVisibility(View.VISIBLE);
} else {
permsView.setVisibility(View.GONE);
}
// Premium SMS permission subsection
TextView securityBillingDesc = (TextView) permsView.findViewById(
R.id.security_settings_billing_desc);
LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
R.id.security_settings_billing_list);
if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
// Show the premium SMS permission selector
securityBillingDesc.setVisibility(View.VISIBLE);
securityBillingList.setVisibility(View.VISIBLE);
Spinner spinner = (Spinner) permsView.findViewById(
R.id.security_settings_premium_sms_list);
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
R.array.security_settings_premium_sms_values,
android.R.layout.simple_spinner_item);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(adapter);
// List items are in the same order as SmsUsageMonitor constants, offset by 1.
spinner.setSelection(premiumSmsPermission - 1);
spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
mPackageName, mSmsManager));
} else {
// Hide the premium SMS permission selector
securityBillingDesc.setVisibility(View.GONE);
securityBillingList.setVisibility(View.GONE);
}
// App permissions subsection
if (asp.getPermissionCount() > 0) {
// Make the security sections header visible
LinearLayout securityList = (LinearLayout) permsView.findViewById(
R.id.security_settings_list);
securityList.removeAllViews();
securityList.addView(asp.getPermissionsViewWithRevokeButtons());
// If this app is running under a shared user ID with other apps,
// update the description to explain this.
String[] packages = mPm.getPackagesForUid(mPackageInfo.applicationInfo.uid);
if (packages != null && packages.length > 1) {
ArrayList<CharSequence> pnames = new ArrayList<CharSequence>();
for (int i=0; i<packages.length; i++) {
String pkg = packages[i];
if (mPackageInfo.packageName.equals(pkg)) {
continue;
}
try {
ApplicationInfo ainfo = mPm.getApplicationInfo(pkg, 0);
pnames.add(ainfo.loadLabel(mPm));
} catch (PackageManager.NameNotFoundException e) {
}
}
final int N = pnames.size();
if (N > 0) {
final Resources res = getActivity().getResources();
String appListStr;
if (N == 1) {
appListStr = pnames.get(0).toString();
} else if (N == 2) {
appListStr = res.getString(R.string.join_two_items, pnames.get(0),
pnames.get(1));
} else {
appListStr = pnames.get(N-2).toString();
for (int i=N-3; i>=0; i--) {
appListStr = res.getString(i == 0 ? R.string.join_many_items_first
: R.string.join_many_items_middle, pnames.get(i), appListStr);
}
appListStr = res.getString(R.string.join_many_items_last,
appListStr, pnames.get(N-1));
}
TextView descr = (TextView) mRootView.findViewById(
R.id.security_settings_desc);
descr.setText(res.getString(R.string.security_settings_desc_multi,
mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
}
}
}
return true;
}
private int getPremiumSmsPermission(String packageName) {
try {
if (mSmsManager != null) {
return mSmsManager.getPremiumSmsPermission(packageName);
}
} catch (RemoteException ex) {
// ignored
}
return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
}
@Override
protected AlertDialog createDialog(int id, int errorCode) {
// No dialogs for Permissions screen.
return null;
}
public static CharSequence getSummary(AppEntry appEntry, Context context) {
if (appEntry.info.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1) {
AppPermissions appPerms = new AppPermissions(context, appEntry.info.packageName);
int count = appPerms.getPermissionCount();
int grantedCount = appPerms.getGrantedPermissionsCount();
return context.getResources().getQuantityString(R.plurals.runtime_permissions_summary,
count, grantedCount, count);
}
AppSecurityPermissions asp = new AppSecurityPermissions(context,
appEntry.info.packageName);
int count = asp.getPermissionCount();
return context.getResources().getQuantityString(R.plurals.permissions_summary,
count, count);
}
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_APP_PERMISSION;
}
private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
private final String mPackageName;
private final ISms mSmsManager;
PremiumSmsSelectionListener(String packageName, ISms smsManager) {
mPackageName = packageName;
mSmsManager = smsManager;
}
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position,
long id) {
if (position >= 0 && position < 3) {
if (localLOGV) Log.d(TAG, "Selected premium SMS policy " + position);
setPremiumSmsPermission(mPackageName, (position + 1));
} else {
Log.e(TAG, "Error: unknown premium SMS policy " + position);
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
// Ignored
}
private void setPremiumSmsPermission(String packageName, int permission) {
try {
if (mSmsManager != null) {
mSmsManager.setPremiumSmsPermission(packageName, permission);
}
} catch (RemoteException ex) {
// ignored
}
}
}
}

5
src/com/android/settings/applications/AppStateBaseBridge.java
View File

@@ -19,8 +19,9 @@ import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.Session;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.Session;
import java.util.ArrayList;

5
src/com/android/settings/applications/AppStateNotificationBridge.java
View File

@@ -17,10 +17,11 @@ package com.android.settings.applications;
import android.content.pm.PackageManager;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.AppFilter;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import java.util.ArrayList;

5
src/com/android/settings/applications/AppStatePowerBridge.java
View File

@@ -15,9 +15,10 @@
*/
package com.android.settings.applications;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.AppFilter;
import com.android.settings.fuelgauge.PowerWhitelistBackend;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import java.util.ArrayList;

5
src/com/android/settings/applications/AppStateUsageBridge.java
View File

@@ -30,8 +30,9 @@ import android.util.ArrayMap;
import android.util.Log;
import android.util.SparseArray;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.AppFilter;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import java.util.List;

6
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -36,15 +36,15 @@ import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.DropDownPreference;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.Callbacks;
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.Callbacks;
import java.util.Collections;
import java.util.List;

5
src/com/android/settings/applications/AppViewHolder.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.applications;
import com.android.settings.R;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -25,6 +23,9 @@ import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settingslib.applications.ApplicationsState;
// View Holder used when displaying views
public class AppViewHolder {
public ApplicationsState.AppEntry entry;

1341
src/com/android/settings/applications/ApplicationsState.java
View File

File diff suppressed because it is too large Load Diff

1
src/com/android/settings/applications/ClearDefaultsPreference.java
View File

@@ -37,6 +37,7 @@ import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.ApplicationsState;
public class ClearDefaultsPreference extends Preference {

5
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.applications;
import android.app.admin.DevicePolicyManager;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.LoaderManager.LoaderCallbacks;
import android.app.admin.DevicePolicyManager;
import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -66,7 +66,6 @@ import com.android.settings.DataUsageSummary.AppItem;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
import com.android.settings.fuelgauge.BatteryEntry;
import com.android.settings.fuelgauge.PowerUsageDetail;
@@ -75,6 +74,8 @@ import com.android.settings.net.ChartDataLoader;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import java.lang.ref.WeakReference;
import java.util.ArrayList;

37
src/com/android/settings/applications/InterestingConfigChanges.java
View File

@@ -1,37 +0,0 @@
/*
* Copyright (C) 2011 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.applications;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
class InterestingConfigChanges {
final Configuration mLastConfiguration = new Configuration();
int mLastDensity;
boolean applyNewConfig(Resources res) {
int configChanges = mLastConfiguration.updateFrom(res.getConfiguration());
boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
if (densityChanged || (configChanges&(ActivityInfo.CONFIG_LOCALE
|ActivityInfo.CONFIG_UI_MODE|ActivityInfo.CONFIG_SCREEN_LAYOUT)) != 0) {
mLastDensity = res.getDisplayMetrics().densityDpi;
return true;
}
return false;
}
}

9
src/com/android/settings/applications/ManageApplications.java
View File

@@ -62,14 +62,15 @@ import com.android.settings.Settings.UsageAccessSettingsActivity;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settings.applications.ApplicationsState.AppFilter;
import com.android.settings.applications.ApplicationsState.CompoundFilter;
import com.android.settings.applications.ApplicationsState.VolumeFilter;
import com.android.settings.fuelgauge.HighPowerDetail;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
import java.util.ArrayList;
import java.util.Collections;

1
src/com/android/settings/applications/RunningState.java
View File

@@ -46,6 +46,7 @@ import android.util.SparseArray;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.InterestingConfigChanges;
import java.util.ArrayList;
import java.util.Collections;

3
src/com/android/settings/fuelgauge/HighPowerDetail.java
View File

@@ -24,10 +24,9 @@ import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.SwitchPreference;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
public class HighPowerDetail extends AppInfoWithHeader implements OnPreferenceChangeListener {