From 9aa5acc03ad6a0fa2aaa75422fad9c02321cb208 Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sun, 20 Dec 2015 11:42:55 +0100 Subject: [PATCH] DroidFish: Fixed lint warning. --- .../colorpicker/ColorPickerDialog.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/DroidFish/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java b/DroidFish/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java index 0169963..5fdc060 100644 --- a/DroidFish/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java +++ b/DroidFish/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java @@ -24,6 +24,7 @@ import android.graphics.PixelFormat; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.LinearLayout; public class ColorPickerDialog @@ -62,20 +63,15 @@ public class ColorPickerDialog } private void setUp(int color) { - - LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - View layout = inflater.inflate(R.layout.dialog_color_picker, null); - - setContentView(layout); + setContentView(R.layout.dialog_color_picker); setTitle(getContext().getText(R.string.prefs_colors_title) + " '" + additionalInfo + "'"); - - mColorPicker = (ColorPickerView) layout.findViewById(R.id.color_picker_view); - mOldColor = (ColorPickerPanelView) layout.findViewById(R.id.old_color_panel); - mNewColor = (ColorPickerPanelView) layout.findViewById(R.id.new_color_panel); - + + mColorPicker = (ColorPickerView) findViewById(R.id.color_picker_view); + mOldColor = (ColorPickerPanelView) findViewById(R.id.old_color_panel); + mNewColor = (ColorPickerPanelView) findViewById(R.id.new_color_panel); + ((LinearLayout) mOldColor.getParent()).setPadding( Math.round(mColorPicker.getDrawingOffset()), 0,