diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-06-08 12:00:02 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-06-08 12:00:02 -0700 |
commit | ab06999a70c773ffbc0aadaf938e0e90f8ca09b2 (patch) | |
tree | 6d2e75139850065bbf15d777917ccd8f6b0f33c1 /src/com | |
parent | e8201984062d4dd471512db8052eaa7fbbe333c9 (diff) | |
download | android_packages_apps_Trebuchet-ab06999a70c773ffbc0aadaf938e0e90f8ca09b2.tar.gz android_packages_apps_Trebuchet-ab06999a70c773ffbc0aadaf938e0e90f8ca09b2.tar.bz2 android_packages_apps_Trebuchet-ab06999a70c773ffbc0aadaf938e0e90f8ca09b2.zip |
Fixing crash on Lollipop
Fragment.getContext is available from MNC onwards.
Using getActivity instead
Change-Id: I99ef98947879ff165895fc76facb438cd4b8b414
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/QsbContainerView.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/SettingsActivity.java | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/QsbContainerView.java b/src/com/android/launcher3/QsbContainerView.java index f931aba21..7d939a0eb 100644 --- a/src/com/android/launcher3/QsbContainerView.java +++ b/src/com/android/launcher3/QsbContainerView.java @@ -86,7 +86,7 @@ public class QsbContainerView extends FrameLayout { IntentFilter filter = new IntentFilter(Launcher.ACTION_APPWIDGET_HOST_RESET); filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED); - getContext().registerReceiver(mRebindReceiver, filter); + getActivity().registerReceiver(mRebindReceiver, filter); } private FrameLayout mWrapper; @@ -98,7 +98,7 @@ public class QsbContainerView extends FrameLayout { if (savedInstanceState != null) { sSavedWidgetId = savedInstanceState.getInt(QSB_WIDGET_ID, -1); } - mWrapper = new FrameLayout(getContext()); + mWrapper = new FrameLayout(getActivity()); mWrapper.addView(createQsb(inflater, mWrapper)); return mWrapper; } @@ -190,7 +190,7 @@ public class QsbContainerView extends FrameLayout { if (resultCode == Activity.RESULT_OK) { int widgetId = data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, sSavedWidgetId); - Utilities.getPrefs(getContext()).edit().putInt(QSB_WIDGET_ID, widgetId).apply(); + Utilities.getPrefs(getActivity()).edit().putInt(QSB_WIDGET_ID, widgetId).apply(); sSavedWidgetId = -1; rebindFragment(); } else if (sSavedWidgetId != -1) { @@ -210,7 +210,7 @@ public class QsbContainerView extends FrameLayout { @Override public void onDestroy() { - getContext().unregisterReceiver(mRebindReceiver); + getActivity().unregisterReceiver(mRebindReceiver); super.onDestroy(); } diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java index 5ef6dd531..cedeb3967 100644 --- a/src/com/android/launcher3/SettingsActivity.java +++ b/src/com/android/launcher3/SettingsActivity.java @@ -59,7 +59,7 @@ public class SettingsActivity extends Activity { // Launcher supports rotation by default. No need to show this setting. getPreferenceScreen().removePreference(rotationPref); } else { - ContentResolver resolver = getContext().getContentResolver(); + ContentResolver resolver = getActivity().getContentResolver(); mRotationLockObserver = new SystemDisplayRotationLockObserver(rotationPref, resolver); // Register a content observer to listen for system setting changes while @@ -70,14 +70,14 @@ public class SettingsActivity extends Activity { // Initialize the UI once mRotationLockObserver.onChange(true); - rotationPref.setDefaultValue(Utilities.getAllowRotationDefaultValue(getContext())); + rotationPref.setDefaultValue(Utilities.getAllowRotationDefaultValue(getActivity())); } } @Override public void onDestroy() { if (mRotationLockObserver != null) { - getContext().getContentResolver().unregisterContentObserver(mRotationLockObserver); + getActivity().getContentResolver().unregisterContentObserver(mRotationLockObserver); mRotationLockObserver = null; } super.onDestroy(); |