TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 07:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix color selection dialog on GB.

Browse Source 
Fixes #3626
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-07-22 17:27:13 -07:00
parent 39ac2b5042
commit b1f336c874
2 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/org/thoughtcrime/securesms/preferences/ColorPreference.java
View File

@@ -223,31 +223,31 @@ public class ColorPreference extends Preference {
}
private void sizeDialog() {
if (mPreference == null || mColorGrid == null) {
return;
}
Dialog dialog = getDialog();
if (dialog == null) {
return;
}
final Resources res = mColorGrid.getContext().getResources();
DisplayMetrics dm = res.getDisplayMetrics();
// Can't use Integer.MAX_VALUE here (weird issue observed otherwise on 4.2)
mColorGrid.measure(
View.MeasureSpec.makeMeasureSpec(dm.widthPixels, View.MeasureSpec.AT_MOST),
View.MeasureSpec.makeMeasureSpec(dm.heightPixels, View.MeasureSpec.AT_MOST));
int width = mColorGrid.getMeasuredWidth();
int height = mColorGrid.getMeasuredHeight();
int extraPadding = res.getDimensionPixelSize(R.dimen.color_grid_extra_padding);
width += extraPadding;
height += extraPadding;
dialog.getWindow().setLayout(width, height);
// if (mPreference == null || mColorGrid == null) {
// return;
// }
//
// Dialog dialog = getDialog();
// if (dialog == null) {
// return;
// }
//
// final Resources res = mColorGrid.getContext().getResources();
// DisplayMetrics dm = res.getDisplayMetrics();
//
// // Can't use Integer.MAX_VALUE here (weird issue observed otherwise on 4.2)
// mColorGrid.measure(
// View.MeasureSpec.makeMeasureSpec(dm.widthPixels, View.MeasureSpec.AT_MOST),
// View.MeasureSpec.makeMeasureSpec(dm.heightPixels, View.MeasureSpec.AT_MOST));
// int width = mColorGrid.getMeasuredWidth();
// int height = mColorGrid.getMeasuredHeight();
//
// int extraPadding = res.getDimensionPixelSize(R.dimen.color_grid_extra_padding);
//
// width += extraPadding;
// height += extraPadding;
//
// dialog.getWindow().setLayout(width, height);
}
}