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

Commit 2010c175 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b am: 2c73cc8c 

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



Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f1883c3 2c73cc8c

src/com/android/settings/network/MobilePlanPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class MobilePlanPreferenceController extends AbstractPreferenceController 
    public static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;



    private static final String TAG = "MobilePlanPrefContr";

    private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";

    static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";

    private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";



    private final UserManager mUserManager;

src/com/android/settings/network/NetworkDashboardFragment.java

+12 −0
Original line number Diff line number Diff line
@@ -174,5 +174,17 @@ public class NetworkDashboardFragment extends DashboardFragment implements 
                            null /* metricsFeatureProvider */, null /* fragment */,

                            null /* mobilePlanHost */);

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> keys = super.getNonIndexableKeys(context);



                    MobilePlanPreferenceController mppc =

                            new MobilePlanPreferenceController(context, null);

                    if (!mppc.isAvailable()) {

                        keys.add(MobilePlanPreferenceController.KEY_MANAGE_MOBILE_PLAN);

                    }

                    return keys;

                }

            };

}