Merge "Consistently use start/end instead of left/right layout properties." into cm-11.0 (775cb142) · Commits · e / os / android_packages_apps_Settings

res/layout/button_backlight.xml

+23 −23

Original line number	Diff line number	Diff line
		@@ -49,22 +49,22 @@
		android:id="@+id/text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="10dip"
		android:paddingRight="10dip"
		android:paddingStart="10dip"
		android:paddingEnd="10dip"
		android:text="@string/button_backlight_seekbar_title" />
		<TextView android:id="@+id/value"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:paddingLeft="10dip"
		android:paddingRight="10dip" />
		android:layout_alignParentEnd="true"
		android:paddingStart="10dip"
		android:paddingEnd="10dip" />
		<SeekBar android:id="@+id/seekbar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/text"
		android:paddingTop="2dip"
		android:paddingLeft="20dip"
		android:paddingRight="20dip" />
		android:paddingStart="20dip"
		android:paddingEnd="20dip" />

		</RelativeLayout>

		@@ -81,22 +81,22 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/backlight_timeout_title"
		android:paddingLeft="10dip"
		android:paddingRight="10dip" />
		android:paddingStart="10dip"
		android:paddingEnd="10dip" />
		<TextView android:id="@+id/timeout_value"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:paddingLeft="10dip"
		android:paddingRight="10dip" />
		android:layout_alignParentEnd="true"
		android:paddingStart="10dip"
		android:paddingEnd="10dip" />
		<com.android.settings.cyanogenmod.BacklightTimeoutSeekBar
		android:id="@+id/timeout_seekbar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/timeout_text"
		android:paddingTop="2dip"
		android:paddingLeft="20dip"
		android:paddingRight="20dip" />
		android:paddingStart="20dip"
		android:paddingEnd="20dip" />

		</RelativeLayout>

		@@ -104,8 +104,8 @@
		android:id="@+id/button_keyboard_divider"
		android:layout_width="match_parent"
		android:layout_height="2dip"
		android:layout_marginLeft="10dip"
		android:layout_marginRight="10dip"
		android:layout_marginStart="10dip"
		android:layout_marginEnd="10dip"
		android:layout_marginTop="5dip"
		android:layout_marginBottom="5dip"
		android:background="@android:drawable/divider_horizontal_dark" />
		@@ -140,22 +140,22 @@
		android:id="@+id/text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="10dip"
		android:paddingRight="10dip"
		android:paddingStart="10dip"
		android:paddingEnd="10dip"
		android:text="@string/keyboard_backlight_seekbar_title" />
		<TextView android:id="@+id/value"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:paddingLeft="10dip"
		android:paddingRight="10dip" />
		android:layout_alignParentEnd="true"
		android:paddingStart="10dip"
		android:paddingEnd="10dip" />
		<SeekBar android:id="@+id/seekbar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/text"
		android:paddingTop="2dip"
		android:paddingLeft="20dip"
		android:paddingRight="20dip" />
		android:paddingStart="20dip"
		android:paddingEnd="20dip" />

		</RelativeLayout>

res/layout/custom_screencolor.xml

+44 −44

Original line number	Diff line number	Diff line
		@@ -63,8 +63,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_above="@id/bottons_layout"
		android:paddingLeft="10dip"
		android:paddingRight="10dip"
		android:paddingStart="10dip"
		android:paddingEnd="10dip"
		android:background="@drawable/transparent_background">

		<RelativeLayout
		@@ -75,22 +75,22 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		android:id="@+id/up_down"
		android:layout_width="48dip"
		android:layout_height="wrap_content"
		android:layout_alignParentLeft="true"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true"
		android:background="@drawable/down_button"/>
		<ImageView
		android:id="@+id/more"
		android:layout_width="48dip"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"
		android:background="@drawable/more_button"/>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/up_down"
		android:layout_toLeftOf="@id/more"
		android:layout_toEndOf="@id/up_down"
		android:layout_toStartOf="@id/more"
		android:gravity="center">
		<Button
		android:id="@+id/previous_btn"
		@@ -111,8 +111,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_above="@id/controls_layout"
		android:paddingLeft="20dip"
		android:paddingRight="20dip"
		android:paddingStart="20dip"
		android:paddingEnd="20dip"
		android:paddingBottom="10dip">
		<LinearLayout android:id="@+id/screencolor_control"
		android:orientation="vertical"
		@@ -121,7 +121,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

		<TextView android:id="@+id/hue"
		android:layout_height="wrap_content"
		android:paddingLeft="20dip"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:layout_width="match_parent"
		android:textColor="@android:color/white"
		@@ -130,40 +130,40 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="10dip"
		android:paddingRight="10dip">
		android:paddingStart="10dip"
		android:paddingEnd="10dip">
		<ImageView
		android:id="@+id/reduce_hue"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:background="@drawable/ic_zoom_out"
		android:layout_alignParentLeft="true"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true"/>
		<ImageView
		android:id="@+id/increase_hue"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:background="@drawable/ic_zoom_in"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"/>
		<SeekBar android:id="@+id/hcontrol"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:thumb="@drawable/ic_zoom_slider"
		android:progressDrawable="@drawable/seekbar_define_style"
		android:layout_toRightOf="@id/reduce_hue"
		android:layout_toLeftOf="@id/increase_hue"
		android:layout_toEndOf="@id/reduce_hue"
		android:layout_toStartOf="@id/increase_hue"
		android:maxHeight="12px"
		android:minHeight="12px"
		android:paddingLeft="20dip"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:paddingRight="20dip"
		android:paddingEnd="20dip"
		android:paddingBottom="10dip"/>
		</RelativeLayout>

		<TextView android:id="@+id/saturation"
		android:layout_height="wrap_content"
		android:paddingLeft="20dip"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:layout_width="fill_parent"
		android:textColor="@android:color/white"
		@@ -171,38 +171,38 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="10dip"
		android:paddingRight="10dip">
		android:paddingStart="10dip"
		android:paddingEnd="10dip">
		<ImageView
		android:id="@+id/reduce_saturation"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_zoom_out"
		android:layout_alignParentLeft="true"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true" />
		<ImageView
		android:id="@+id/increase_saturation"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_zoom_in"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"/>
		<SeekBar android:id="@+id/scontrol"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:thumb="@drawable/ic_zoom_slider"
		android:progressDrawable="@drawable/seekbar_define_style"
		android:layout_toRightOf="@id/reduce_saturation"
		android:layout_toLeftOf="@id/increase_saturation"
		android:paddingLeft="20dip"
		android:layout_toEndOf="@id/reduce_saturation"
		android:layout_toStartOf="@id/increase_saturation"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:paddingRight="20dip"
		android:paddingEnd="20dip"
		android:paddingBottom="10dip"/>
		</RelativeLayout>

		<TextView android:id="@+id/contrast"
		android:layout_height="wrap_content"
		android:paddingLeft="20dip"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:layout_width="fill_parent"
		android:textColor="@android:color/white"
		@@ -210,38 +210,38 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="10dip"
		android:paddingRight="10dip">
		android:paddingStart="10dip"
		android:paddingEnd="10dip">
		<ImageView
		android:id="@+id/reduce_contrast"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_zoom_out"
		android:layout_alignParentLeft="true"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true" />
		<ImageView
		android:id="@+id/increase_contrast"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_zoom_in"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"/>
		<SeekBar android:id="@+id/ccontrol"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:thumb="@drawable/ic_zoom_slider"
		android:progressDrawable="@drawable/seekbar_define_style"
		android:layout_toRightOf="@id/reduce_contrast"
		android:layout_toLeftOf="@id/increase_contrast"
		android:paddingLeft="20dip"
		android:layout_toEndOf="@id/reduce_contrast"
		android:layout_toStartOf="@id/increase_contrast"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:paddingRight="20dip"
		android:paddingEnd="20dip"
		android:paddingBottom="10dip"/>
		</RelativeLayout>

		<TextView android:id="@+id/intensity"
		android:layout_height="wrap_content"
		android:paddingLeft="20dip"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:layout_width="fill_parent"
		android:textColor="@android:color/white"
		@@ -249,33 +249,33 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="10dip"
		android:paddingRight="10dip"
		android:paddingStart="10dip"
		android:paddingEnd="10dip"
		android:id="@+id/intensity_layout">
		<ImageView
		android:id="@+id/reduce_intensity"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_zoom_out"
		android:layout_alignParentLeft="true"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true" />
		<ImageView
		android:id="@+id/increase_intensity"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_zoom_in"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"/>
		<SeekBar android:id="@+id/icontrol"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:thumb="@drawable/ic_zoom_slider"
		android:progressDrawable="@drawable/seekbar_define_style"
		android:layout_toRightOf="@id/reduce_intensity"
		android:layout_toLeftOf="@id/increase_intensity"
		android:paddingLeft="20dip"
		android:layout_toEndOf="@id/reduce_intensity"
		android:layout_toStartOf="@id/increase_intensity"
		android:paddingStart="20dip"
		android:paddingTop="10dip"
		android:paddingRight="20dip"
		android:paddingEnd="20dip"
		android:paddingBottom="10dip"/>
		</RelativeLayout>
		</LinearLayout>

res/layout/dialog_auto_brightness.xml

+10 −10

Original line number	Diff line number	Diff line
		@@ -32,40 +32,40 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="6dip"
		android:layout_marginLeft="12dip"
		android:layout_marginRight="20dip"
		android:layout_marginStart="12dip"
		android:layout_marginEnd="20dip"
		android:text="@string/auto_brightness_adjustment_title" />

		<com.android.settings.cyanogenmod.MagneticCenterSeekBar android:id="@+id/adjustment"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="4dip"
		android:layout_marginLeft="20dip"
		android:layout_marginRight="20dip"
		android:layout_marginStart="20dip"
		android:layout_marginEnd="20dip"
		android:max="10000" />

		<CheckBox android:id="@+id/twilight_adjustment"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="4dip"
		android:layout_marginLeft="12dip"
		android:layout_marginRight="20dip"
		android:layout_marginStart="12dip"
		android:layout_marginEnd="20dip"
		android:text="@string/auto_brightness_twilight_adjustment" />

		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="6dip"
		android:layout_marginLeft="12dip"
		android:layout_marginRight="20dip"
		android:layout_marginStart="12dip"
		android:layout_marginEnd="20dip"
		android:text="@string/auto_brightness_sensitivity_title" />

		<Spinner android:id="@+id/sensitivity"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="4dip"
		android:layout_marginLeft="20dip"
		android:layout_marginRight="20dip" />
		android:layout_marginStart="20dip"
		android:layout_marginEnd="20dip" />

		</LinearLayout>

res/layout/display_color_calibration.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		<TextView android:id="@+id/color_red_value"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:paddingTop="10dip" />
		<SeekBar android:id="@+id/color_red_seekbar"
		android:layout_width="match_parent"
		@@ -52,7 +52,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@id/color_red_seekbar"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:paddingTop="10dip" />
		<SeekBar android:id="@+id/color_green_seekbar"
		android:layout_width="match_parent"
		@@ -61,7 +61,7 @@
		android:paddingTop="2dip" />

		<TextView android:id="@+id/color_blue_text"
		android:layout_width="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@id/color_green_seekbar"
		android:text="@string/color_blue_title"
		@@ -70,7 +70,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@id/color_green_seekbar"
		android:layout_alignParentRight="true"
		android:layout_alignParentEnd="true"
		android:paddingTop="10dip" />
		<SeekBar android:id="@+id/color_blue_seekbar"
		android:layout_width="match_parent"

res/layout/display_gamma_calibration_item.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		<TextView android:id="@+id/color_value"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true" />
		android:layout_alignParentEnd="true" />
		<SeekBar android:id="@+id/color_seekbar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"