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

Fixing crash on Lollipop

Browse Source 
Fragment.getContext is available from MNC onwards.
Using getActivity instead

Change-Id: I99ef98947879ff165895fc76facb438cd4b8b414
This commit is contained in:
Sunny Goyal
2016-06-08 12:00:02 -07:00
parent e820198406
commit ab06999a70
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/QsbContainerView.java
+4 -4
View File
@@ -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();
}
src/com/android/launcher3/SettingsActivity.java
+3 -3
View File
@@ -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();