Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev (1e0ea452) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DataUsageSummary.java

+13 −11

Original line number	Diff line number	Diff line
		@@ -402,7 +402,6 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		mAppSwitches = (LinearLayout) mAppDetail.findViewById(R.id.app_switches);

		mAppSettings = (Button) mAppDetail.findViewById(R.id.app_settings);
		mAppSettings.setOnClickListener(mAppSettingsListener);

		mAppRestrict = new Switch(inflater.getContext());
		mAppRestrict.setClickable(false);
		@@ -860,11 +859,24 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		}
		}

		mAppSettings.setOnClickListener(new OnClickListener() {
		@Override
		public void onClick(View v) {
		if (!isAdded()) {
		return;
		}

		// TODO: target towards entire UID instead of just first package
		getActivity().startActivityAsUser(mAppSettingsIntent,
		new UserHandle(UserHandle.getUserId(uid)));
		}
		});
		mAppSettings.setEnabled(matchFound);
		mAppSettings.setVisibility(View.VISIBLE);

		} else {
		mAppSettingsIntent = null;
		mAppSettings.setOnClickListener(null);
		mAppSettings.setVisibility(View.GONE);
		}

		@@ -1117,16 +1129,6 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		}
		};

		private OnClickListener mAppSettingsListener = new OnClickListener() {
		@Override
		public void onClick(View v) {
		if (!isAdded()) return;

		// TODO: target torwards entire UID instead of just first package
		startActivity(mAppSettingsIntent);
		}
		};

		private OnItemClickListener mListListener = new OnItemClickListener() {
		@Override
		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {