Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de41256d authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24604368



Change-Id: If09e05a6f965cef5432feca8b06043e45117dda2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae0e9ab9 f2735dec

src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java

+24 −2
Original line number Diff line number Diff line
@@ -37,10 +37,14 @@ import android.util.Log; 


import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.preference.Preference;



import com.android.internal.annotations.VisibleForTesting;

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 java.util.ArrayList;
@@ -49,7 +53,7 @@ import java.util.List; 
/**

 * App specific activity to show aspect ratio overrides

 */

public class UserAspectRatioDetails extends AppInfoWithHeader implements

public class UserAspectRatioDetails extends AppInfoBase implements

        RadioWithImagePreference.OnClickListener {

    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() {

        addPreferencesFromResource(R.xml.user_aspect_ratio_details);