Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f6e995b authored by Dees Troy's avatar Dees Troy Committed by Gerrit Code Review
Browse files

Merge "Fix incorrect alignment of Restore Defaults button in some themes" into android-4.4

parents 7e303cfe 781e689f

gui/devices/1080x1920/res/ui.xml

+8 −8
Original line number Diff line number Diff line
@@ -2465,20 +2465,20 @@ 
			</object>



                        <object type="button">

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<placement x="%col1_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Vibration Duration</text>

				<text>Restore Defaults</text>

				<image resource="main_button" />

				<action function="page">Vibrate</action>

				<action function="restoredefaultsettings"></action>

			</object>



			<object type="button">

				<placement x="%col_x%" y="%row4_y%" />

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Restore Defaults</text>

				<text>Vibration Duration</text>

				<image resource="main_button" />

				<action function="restoredefaultsettings"></action>

				<action function="page">Vibrate</action>

			</object>



			<object type="action">

gui/devices/1200x1920/res/ui.xml

+8 −8
Original line number Diff line number Diff line
@@ -2468,20 +2468,20 @@ 
			</object>



                        <object type="button">

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<placement x="%col1_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Vibration Duration</text>

				<text>Restore Defaults</text>

				<image resource="main_button" />

				<action function="page">Vibrate</action>

				<action function="restoredefaultsettings"></action>

			</object>



			<object type="button">

				<placement x="%col_x%" y="%row4_y%" />

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Restore Defaults</text>

				<text>Vibration Duration</text>

				<image resource="main_button" />

				<action function="restoredefaultsettings"></action>

				<action function="page">Vibrate</action>

			</object>



			<object type="action">

gui/devices/320x480/res/ui.xml

+8 −8
Original line number Diff line number Diff line
@@ -2452,20 +2452,20 @@ 
			</object>



                        <object type="button">

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<placement x="%col1_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Vibration Duration</text>

				<text>Restore Defaults</text>

				<image resource="main_button" />

				<action function="page">Vibrate</action>

				<action function="restoredefaultsettings"></action>

			</object>



			<object type="button">

				<placement x="%col_x%" y="%row4_y%" />

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Restore Defaults</text>

				<text>Vibration Duration</text>

				<image resource="main_button" />

				<action function="restoredefaultsettings"></action>

				<action function="page">Vibrate</action>

			</object>



			<object type="action">

gui/devices/480x800/res/ui.xml

+8 −8
Original line number Diff line number Diff line
@@ -2452,20 +2452,20 @@ 
			</object>



                        <object type="button">

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<placement x="%col1_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Vibration Duration</text>

				<text>Restore Defaults</text>

				<image resource="main_button" />

				<action function="page">Vibrate</action>

				<action function="restoredefaultsettings"></action>

			</object>



			<object type="button">

				<placement x="%col_x%" y="%row4_y%" />

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Restore Defaults</text>

				<text>Vibration Duration</text>

				<image resource="main_button" />

				<action function="restoredefaultsettings"></action>

				<action function="page">Vibrate</action>

			</object>



			<object type="action">

gui/devices/480x854/res/ui.xml

+8 −8
Original line number Diff line number Diff line
@@ -2451,20 +2451,20 @@ 
			</object>



                        <object type="button">

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<placement x="%col1_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Vibration Duration</text>

				<text>Restore Defaults</text>

				<image resource="main_button" />

				<action function="page">Vibrate</action>

				<action function="restoredefaultsettings"></action>

			</object>



			<object type="button">

				<placement x="%col_x%" y="%row4_y%" />

				<highlight color="%highlight_color%" />

				<placement x="%col2_x%" y="%row4_y%" />

				<font resource="font" color="%button_text_color%" />

				<text>Restore Defaults</text>

				<text>Vibration Duration</text>

				<image resource="main_button" />

				<action function="restoredefaultsettings"></action>

				<action function="page">Vibrate</action>

			</object>



			<object type="action">