summaryrefslogtreecommitdiffstats
path: root/gui/theme/common
diff options
context:
space:
mode:
authorAleksa Sarai <cyphar@cyphar.com>2015-12-31 17:36:00 +0100
committerz31s1g <z31s1g@googlemail.com>2016-01-02 19:44:48 +0100
commitb25a18395e666bbe13506651d5de84054aae0fcc (patch)
tree2fd5195a8b25ac31b614cea56c67499866434bcd /gui/theme/common
parenttwrp: fix a typo and remove whitespace (diff)
downloadandroid_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.tar
android_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.tar.gz
android_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.tar.bz2
android_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.tar.lz
android_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.tar.xz
android_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.tar.zst
android_bootable_recovery-b25a18395e666bbe13506651d5de84054aae0fcc.zip
Diffstat (limited to 'gui/theme/common')
-rwxr-xr-xgui/theme/common/landscape.xml39
-rwxr-xr-xgui/theme/common/languages/en.xml1
-rwxr-xr-xgui/theme/common/portrait.xml37
-rwxr-xr-xgui/theme/common/watch.xml76
4 files changed, 147 insertions, 6 deletions
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 938c8548d..35986dddc 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -176,6 +176,10 @@
<colors line="%fileselector_linecolor%"/>
<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
</style>
+
+ <style name="patternpassword">
+ <size name="tw_gui_pattern_grid_size" default="3"/>
+ </style>
</styles>
<pages>
@@ -3911,19 +3915,48 @@
</text>
<text style="text_m_accent">
- <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <placement x="%col2_x_left%" y="%row2_y%" placement="5"/>
<text>{@decrypt_data_enter_pattern=Enter Pattern.}</text>
</text>
+ <text style="text_m_fail">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%col2_x_left%" y="%row3_y%" placement="5"/>
+ <text>{@decryt_data_failed_pattern=Pattern failed, please try again!}</text>
+ </text>
+
<patternpassword>
- <placement x="%pattern_x%" y="%row4_y%" w="%pattern_size%" h="%pattern_size%"/>
- <size name="tw_pattern_grid_size" default="3"/>
+ <placement x="%pattern_x%" y="%row4a_y%" w="%pattern_size%" h="%pattern_size%"/>
<dot color="%fileselector_linecolor%" activecolor="%accent_color%" radius="%pattern_dot_dia%"/>
<line color="%fileselector_linecolor%" width="%pattern_line_w%"/>
<data name="tw_crypto_password"/>
<action function="page">trydecrypt</action>
</patternpassword>
+ <button style="main_button_half_width_low">
+ <placement x="%col_button_right%" y="%row1a_y%"/>
+ <text>3x3</text>
+ <action function="set">tw_gui_pattern_grid_size=3</action>
+ </button>
+
+ <button style="main_button_half_width_low">
+ <placement x="%col_button_right%" y="%row4a_y%"/>
+ <text>4x4</text>
+ <action function="set">tw_gui_pattern_grid_size=4</action>
+ </button>
+
+ <button style="main_button_half_width_low">
+ <placement x="%col_button_right%" y="%row7a_y%"/>
+ <text>5x5</text>
+ <action function="set">tw_gui_pattern_grid_size=5</action>
+ </button>
+
+ <button style="main_button_half_width_low">
+ <placement x="%col_button_right%" y="%row10a_y%"/>
+ <text>6x6</text>
+ <action function="set">tw_gui_pattern_grid_size=6</action>
+ </button>
+
<button style="main_button_half_width">
<placement x="%col2_x_right%" y="%row15a_y%"/>
<text>{@cancel_btn=Cancel}</text>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 2847d2253..e417ace54 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -435,6 +435,7 @@
<string name="decrypt_data_hdr">Decrypt Data</string>
<string name="decrypt_data_enter_pass"></string>
<string name="decryt_data_failed">Password failed, please try again!</string>
+ <string name="decryt_data_failed_pattern">Pattern failed, please try again!</string>
<string name="decrypt_data_enter_pattern">Enter Pattern.</string>
<string name="decrypt_data_trying">Trying Decryption</string>
<string name="term_hdr">Terminal Command</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 2cd49e4c6..2d399babe 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -141,6 +141,10 @@
<colors line="%fileselector_linecolor%"/>
<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
</style>
+
+ <style name="patternpassword">
+ <size name="tw_gui_pattern_grid_size" default="3"/>
+ </style>
</styles>
<pages>
@@ -3986,15 +3990,44 @@
<text>{@decrypt_data_enter_pattern=Enter Pattern.}</text>
</text>
+ <text style="text_m_fail">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%center_x%" y="%row3_y%" placement="5"/>
+ <text>{@decryt_data_failed_pattern=Pattern failed, please try again!}</text>
+ </text>
+
<patternpassword>
- <placement x="%pattern_x%" y="%row6_y%" w="%pattern_size%" h="%pattern_size%"/>
- <size name="tw_pattern_grid_size" default="3"/>
+ <placement x="%pattern_x%" y="%row5_y%" w="%pattern_size%" h="%pattern_size%"/>
<dot color="%fileselector_linecolor%" activecolor="%accent_color%" radius="%pattern_dot_dia%"/>
<line color="%fileselector_linecolor%" width="%pattern_line_w%"/>
<data name="tw_crypto_password"/>
<action function="page">trydecrypt</action>
</patternpassword>
+ <button style="button_quarter_width">
+ <placement x="%indent%" y="%row19a_y%"/>
+ <text>3x3</text>
+ <action function="set">tw_gui_pattern_grid_size=3</action>
+ </button>
+
+ <button style="button_quarter_width">
+ <placement x="%btn4_col2_x%" y="%row19a_y%"/>
+ <text>4x4</text>
+ <action function="set">tw_gui_pattern_grid_size=4</action>
+ </button>
+
+ <button style="button_quarter_width">
+ <placement x="%btn4_col3_x%" y="%row19a_y%"/>
+ <text>5x5</text>
+ <action function="set">tw_gui_pattern_grid_size=5</action>
+ </button>
+
+ <button style="button_quarter_width">
+ <placement x="%btn4_col4_x%" y="%row19a_y%"/>
+ <text>6x6</text>
+ <action function="set">tw_gui_pattern_grid_size=6</action>
+ </button>
+
<button style="main_button_half_height">
<placement x="%indent%" y="%row21a_y%"/>
<text>{@cancel_btn=Cancel}</text>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 2ed266aad..382b2e186 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -68,6 +68,10 @@
<image resource="tab_3"/>
</style>
+ <style name="button_navbar">
+ <font resource="font_m" color="%text_button_color%"/>
+ </style>
+
<style name="console">
<color foreground="%text_color%" background="%background_color%" scroll="%background_color%"/>
<font resource="fixed"/>
@@ -167,6 +171,10 @@
<colors line="%fileselector_linecolor%"/>
<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
</style>
+
+ <style name="patternpassword">
+ <size name="tw_gui_pattern_grid_size" default="3"/>
+ </style>
</styles>
<pages>
@@ -4780,16 +4788,27 @@
<template name="statusbar"/>
+ <action>
+ <action function="set">tw_gui_pattern_grid_size=3</action>
+ </action>
+
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
<text>{@mount_hdr=Mount} &gt; {@decrypt_data_hdr=Decrypt Data}</text>
</text>
<text style="text_m_accent">
+ <condition var1="tw_password_fail" op="!=" var2="1"/>
<placement x="%center_x%" y="%row5_y%" placement="5"/>
<text>{@decrypt_data_enter_pattern=Enter Pattern.}</text>
</text>
+ <text style="text_m_fail">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%center_x%" y="%row5_y%" placement="5"/>
+ <text>{@decryt_data_failed_pattern=Pattern failed, please try again!}</text>
+ </text>
+
<text style="text_m">
<placement x="%center_x%" y="%row10_y%" placement="5"/>
<text>{@back_cancel=Press back to cancel.}</text>
@@ -4797,7 +4816,6 @@
<patternpassword>
<placement x="%pattern_x%" y="%row2_y%" w="%pattern_size%" h="%pattern_size%"/>
- <size name="tw_pattern_grid_size" default="3"/>
<dot color="%fileselector_linecolor%" activecolor="%accent_color%" radius="%pattern_dot_dia%"/>
<line color="%fileselector_linecolor%" width="%pattern_line_w%"/>
<data name="tw_crypto_password"/>
@@ -4817,6 +4835,62 @@
<action function="page">main</action>
</actions>
</button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="3"/>
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_less"/>
+ <action function="set">tw_gui_pattern_grid_size=3</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="4"/>
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_less"/>
+ <action function="set">tw_gui_pattern_grid_size=3</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="5"/>
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_less"/>
+ <action function="set">tw_gui_pattern_grid_size=4</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="6"/>
+ <placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_less"/>
+ <action function="set">tw_gui_pattern_grid_size=5</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="3"/>
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_more"/>
+ <action function="set">tw_gui_pattern_grid_size=4</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="4"/>
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_more"/>
+ <action function="set">tw_gui_pattern_grid_size=5</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="5"/>
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_more"/>
+ <action function="set">tw_gui_pattern_grid_size=6</action>
+ </button>
+
+ <button>
+ <condition var1="tw_gui_pattern_grid_size" var2="6"/>
+ <placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+ <image resource="grid_more"/>
+ <action function="set">tw_gui_pattern_grid_size=6</action>
+ </button>
</page>
<page name="trydecrypt">