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

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

Browse Source
This commit is contained in:
Dees Troy
2014-03-10 16:29:06 +01:00
committed by Gerrit Code Review
parent 7e303cfeb8 781e689f37
commit 2f6e995b39
8 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/devices/1080x1920/res/ui.xml
+8 -8
View File
@@ -2464,6 +2464,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2473,14 +2481,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/1200x1920/res/ui.xml
+8 -8
View File
@@ -2467,6 +2467,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2476,14 +2484,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/320x480/res/ui.xml
+8 -8
View File
@@ -2451,6 +2451,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2460,14 +2468,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/480x800/res/ui.xml
+8 -8
View File
@@ -2451,6 +2451,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2460,14 +2468,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/480x854/res/ui.xml
+8 -8
View File
@@ -2450,6 +2450,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2459,14 +2467,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/540x960/res/ui.xml
+8 -8
View File
@@ -2451,6 +2451,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2460,14 +2468,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/720x1280/res/ui.xml
+8 -8
View File
@@ -2464,6 +2464,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2473,14 +2481,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>
gui/devices/800x1280/res/ui.xml
+8 -8
View File
@@ -2452,6 +2452,14 @@
<action function="page">screen</action>
</object>
<object type="button">
<placement x="%col1_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="button">
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_y%" />
@@ -2461,14 +2469,6 @@
<action function="page">Vibrate</action>
</object>
<object type="button">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
<action function="restoredefaultsettings"></action>
</object>
<object type="action">
<touch key="home" />
<action function="page">main</action>