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

Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev

Browse Source
This commit is contained in:
Massimo Carli
2023-09-08 21:52:03 +00:00
committed by Android (Google) Code Review
parent 8dea913ea0 21f0f870f5
commit f2735decd6
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
View File

@@ -37,10 +37,14 @@ import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.widget.ActionButtonsPreference; import com.android.settingslib.widget.ActionButtonsPreference;
import java.util.ArrayList; import java.util.ArrayList;
@@ -49,7 +53,7 @@ import java.util.List;
/** /**
* App specific activity to show aspect ratio overrides * App specific activity to show aspect ratio overrides
*/ */
public class UserAspectRatioDetails extends AppInfoWithHeader implements public class UserAspectRatioDetails extends AppInfoBase implements
RadioWithImagePreference.OnClickListener { RadioWithImagePreference.OnClickListener {
private static final String TAG = UserAspectRatioDetails.class.getSimpleName(); private static final String TAG = UserAspectRatioDetails.class.getSimpleName();
@@ -178,6 +182,24 @@ public class UserAspectRatioDetails extends AppInfoWithHeader implements
} }
} }
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final Preference pref = EntityHeaderController
.newInstance(getActivity(), this, null /* header */)
.setIcon(Utils.getBadgedIcon(getContext(), mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
.setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
.setPackageName(mPackageName)
.setUid(mPackageInfo.applicationInfo.uid)
.setHasAppInfoLink(true)
.setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
EntityHeaderController.ActionType.ACTION_NONE)
.done(getActivity(), getPrefContext());
getPreferenceScreen().addPreference(pref);
}
private void initPreferences() { private void initPreferences() {
addPreferencesFromResource(R.xml.user_aspect_ratio_details); addPreferencesFromResource(R.xml.user_aspect_ratio_details);