Merge "Reworked additional permissions fragment for each app" (70c1e8af) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java

+45 −30

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,6 @@ import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.provider.Settings;		import android.provider.Settings;
	import android.support.v14.preference.SwitchPreference;		import android.support.v14.preference.SwitchPreference;
	import android.support.v17.leanback.widget.VerticalGridView;
	import android.support.v7.preference.Preference;		import android.support.v7.preference.Preference;
	import android.support.v7.preference.Preference.OnPreferenceChangeListener;		import android.support.v7.preference.Preference.OnPreferenceChangeListener;
	import android.support.v7.preference.Preference.OnPreferenceClickListener;		import android.support.v7.preference.Preference.OnPreferenceClickListener;
	@@ -44,7 +43,9 @@ import android.view.MenuInflater;
	import android.view.MenuItem;		import android.view.MenuItem;
	import android.view.View;		import android.view.View;
	import android.widget.Toast;		import android.widget.Toast;

	import com.android.packageinstaller.R;		import com.android.packageinstaller.R;

	import com.android.packageinstaller.permission.model.AppPermissionGroup;		import com.android.packageinstaller.permission.model.AppPermissionGroup;
	import com.android.packageinstaller.permission.model.AppPermissions;		import com.android.packageinstaller.permission.model.AppPermissions;
	import com.android.packageinstaller.permission.ui.ReviewPermissionsActivity;		import com.android.packageinstaller.permission.ui.ReviewPermissionsActivity;
	@@ -178,17 +179,6 @@ public final class AppPermissionsFragment extends SettingsWithHeader
	R.string.app_permissions_decor_title));		R.string.app_permissions_decor_title));
	}		}

	@Override
	protected void updateHeader() {

	super.updateHeader();
	Preference headerLineTwo = getPreferenceScreen().findPreference(HEADER_PREFERENCE_KEY);
	if (headerLineTwo != null) {
	headerLineTwo.setTitle(mLabel);
	headerLineTwo.setIcon(mIcon);
	}
	}

	private void loadPreferences() {		private void loadPreferences() {
	Context context = getPreferenceManager().getContext();		Context context = getPreferenceManager().getContext();
	if (context == null) {		if (context == null) {
	@@ -197,25 +187,11 @@ public final class AppPermissionsFragment extends SettingsWithHeader

	PreferenceScreen screen = getPreferenceScreen();		PreferenceScreen screen = getPreferenceScreen();
	screen.removeAll();		screen.removeAll();
			screen.addPreference(createHeaderLineTwoPreference(context));
	// Setting the second-line header that contains the app banner icon and its name.
	// The styling used is the same as a leanback preference with a customized background color.
	Preference headerLineTwo = new Preference(context) {
	@Override
	public void onBindViewHolder(PreferenceViewHolder holder) {
	super.onBindViewHolder(holder);
	holder.itemView.setBackgroundColor(
	getResources().getColor(R.color.lb_header_banner_color));
	}
	};
	headerLineTwo.setKey(HEADER_PREFERENCE_KEY);
	headerLineTwo.setSelectable(false);
	headerLineTwo.setTitle(mLabel);
	headerLineTwo.setIcon(mIcon);
	screen.addPreference(headerLineTwo);

	if (mExtraScreen != null) {		if (mExtraScreen != null) {
	mExtraScreen.removeAll();		mExtraScreen.removeAll();
			mExtraScreen = null;
	}		}

	final Preference extraPerms = new Preference(context);		final Preference extraPerms = new Preference(context);
	@@ -249,6 +225,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
	} else {		} else {
	if (mExtraScreen == null) {		if (mExtraScreen == null) {
	mExtraScreen = getPreferenceManager().createPreferenceScreen(context);		mExtraScreen = getPreferenceManager().createPreferenceScreen(context);
			mExtraScreen.addPreference(createHeaderLineTwoPreference(context));
	}		}
	mExtraScreen.addPreference(preference);		mExtraScreen.addPreference(preference);
	}		}
	@@ -277,6 +254,30 @@ public final class AppPermissionsFragment extends SettingsWithHeader
	setLoading(false /* loading /, true / animate */);		setLoading(false /* loading /, true / animate */);
	}		}

			/**
			* Creates a heading below decor_title and above the rest of the preferences. This heading
			* displays the app name and banner icon. It's used in both system and additional permissions
			* fragments for each app. The styling used is the same as a leanback preference with a
			* customized background color
			* @param context The context the preferences created on
			* @return The preference header to be inserted as the first preference in the list.
			*/
			private Preference createHeaderLineTwoPreference(Context context) {
			Preference headerLineTwo = new Preference(context) {
			@Override
			public void onBindViewHolder(PreferenceViewHolder holder) {
			super.onBindViewHolder(holder);
			holder.itemView.setBackgroundColor(
			getResources().getColor(R.color.lb_header_banner_color));
			}
			};
			headerLineTwo.setKey(HEADER_PREFERENCE_KEY);
			headerLineTwo.setSelectable(false);
			headerLineTwo.setTitle(mLabel);
			headerLineTwo.setIcon(mIcon);
			return headerLineTwo;
			}

	@Override		@Override
	public boolean onPreferenceChange(final Preference preference, Object newValue) {		public boolean onPreferenceChange(final Preference preference, Object newValue) {
	String groupName = preference.getKey();		String groupName = preference.getKey();
	@@ -387,8 +388,6 @@ public final class AppPermissionsFragment extends SettingsWithHeader
	public void onCreate(Bundle savedInstanceState) {		public void onCreate(Bundle savedInstanceState) {
	mOuterFragment = (AppPermissionsFragment) getTargetFragment();		mOuterFragment = (AppPermissionsFragment) getTargetFragment();
	super.onCreate(savedInstanceState);		super.onCreate(savedInstanceState);
	setHeader(mOuterFragment.mIcon, mOuterFragment.mLabel, mOuterFragment.mInfoIntent,
	null);
	setHasOptionsMenu(true);		setHasOptionsMenu(true);
	}		}

	@@ -404,6 +403,22 @@ public final class AppPermissionsFragment extends SettingsWithHeader
	bindUi(this, getPackageInfo(getActivity(), packageName));		bindUi(this, getPackageInfo(getActivity(), packageName));
	}		}

			private static void bindUi(SettingsWithHeader fragment, PackageInfo packageInfo) {
			Activity activity = fragment.getActivity();
			PackageManager pm = activity.getPackageManager();
			ApplicationInfo appInfo = packageInfo.applicationInfo;
			Intent infoIntent = null;
			if (!activity.getIntent().getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)) {
			infoIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
			.setData(Uri.fromParts("package", packageInfo.packageName, null));
			}

			Drawable icon = appInfo.loadIcon(pm);
			CharSequence label = appInfo.loadLabel(pm);
			fragment.setHeader(icon, label, infoIntent, fragment.getString(
			R.string.additional_permissions_decor_title));
			}

	@Override		@Override
	public boolean onOptionsItemSelected(MenuItem item) {		public boolean onOptionsItemSelected(MenuItem item) {
	switch (item.getItemId()) {		switch (item.getItemId()) {