summaryrefslogtreecommitdiff
authorTing Li <ting.li@amlogic.com>2016-11-25 08:26:41 (GMT)
committer Ting Li <ting.li@amlogic.com>2016-11-25 11:14:42 (GMT)
commitea1ff8c67a2f4453e14c66cd8046f8df528e4e51 (patch)
treef9d960067996bc9866e4b63e912d544820d1cbd7
parent20aa906d4c178a85d2f9b950789bc1669649afd9 (diff)
downloadOTAUpgrade2-ea1ff8c67a2f4453e14c66cd8046f8df528e4e51.zip
OTAUpgrade2-ea1ff8c67a2f4453e14c66cd8046f8df528e4e51.tar.gz
OTAUpgrade2-ea1ff8c67a2f4453e14c66cd8046f8df528e4e51.tar.bz2
pd#135788 adjuest otaupgrade ui for multiple density
Change-Id: I265ce82718fbf22a1e081f10b9bebe96a01f5cb4
Diffstat
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/drawable-hdpi/bg.png17
-rw-r--r--res/layout-hdpi/main_view.xml244
-rw-r--r--res/layout-xhdpi/main_view.xml243
-rwxr-xr-xres/layout/file_list.xml2
-rw-r--r--res/layout/install_ota.xml21
-rwxr-xr-xres/layout/large_text.xml3
-rwxr-xr-xres/layout/main_view.xml2
-rw-r--r--[-rwxr-xr-x]res/layout/medium_text.xml5
-rwxr-xr-xres/layout/mid.xml23
-rw-r--r--res/values-hdpi/dimens.xml26
-rw-r--r--res/values-xhdpi/dimens.xml26
-rwxr-xr-xres/values/color.xml5
-rw-r--r--res/values/dimens.xml26
-rwxr-xr-xres/values/styles.xml37
15 files changed, 647 insertions, 35 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2c8bd3e..e2d521c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,7 +59,7 @@
<activity
android:name="com.droidlogic.otaupgrade.BadMovedSDcard"
android:screenOrientation="landscape"
- android:theme="@android:style/Theme.Holo.Dialog" >
+ android:theme="@style/dialog" >
</activity>
<activity
android:name="com.droidlogic.otaupgrade.MainActivity"
diff --git a/res/drawable-hdpi/bg.png b/res/drawable-hdpi/bg.png
new file mode 100644
index 0000000..cbd266d
--- a/dev/null
+++ b/res/drawable-hdpi/bg.png
@@ -0,0 +1,17 @@
+‰PNG
+
+
+€ƒKwe
+€ƒKwe
+€ƒKwe
+€ƒKwe
+€ƒKwe
+€ƒKwe
+€ƒKwe
+€µ«38˜ €¹/  @€ĄZ°vu'@€
+€µ«38˜ €¹/  @€ĄZ°vu'@€
+€µ«38˜ €¹/  @€ĄZ°vu'@€
+€µ«38˜ €¹/  @€ĄZ°vu'@€
+€µ«38˜ €¹/  @€ĄZ°vu'@€
+€µ«38˜ €¹/  @€ĄZ°vu'@€
+¼¼¼<^__?ż?’@€
diff --git a/res/layout-hdpi/main_view.xml b/res/layout-hdpi/main_view.xml
new file mode 100644
index 0000000..03afc71
--- a/dev/null
+++ b/res/layout-hdpi/main_view.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <TextView
+ android:id="@+id/updateview"
+ style="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/text_titile_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="10dp"
+ android:text="@string/update_title" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="2dp"
+ android:layout_below="@+id/updateview"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:background="#FFFFFF" />
+
+ <TextView
+ android:id="@+id/updateonline"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/updateview"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="6dp"
+ android:text="@string/update_online" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="2dp"
+ android:layout_below="@+id/updateonline"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+
+ <Button
+ android:id="@+id/updatebtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/updateonline"
+ android:layout_marginRight="20dp"
+ android:layout_marginTop="10dp"
+ android:text="@string/update_online" >
+ </Button>
+ <RelativeLayout
+ android:id="@+id/update_locale_layer"
+ android:layout_width="match_parent"
+ android:layout_below="@+id/updatebtn"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/updatelocale"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:text="@string/update_locale" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="2dp"
+ android:layout_below="@+id/updatelocale"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+
+ <LinearLayout
+ android:id="@+id/showdetail"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/updatelocale"
+ android:layout_centerHorizontal="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="10dp"
+ android:divider="#F0ECECEC"
+ android:orientation="vertical" >
+
+ <CheckBox
+ android:id="@+id/wipedata"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="2dp"
+ android:text="@string/wipe_data" />
+
+ <CheckBox
+ android:id="@+id/wipemedia"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="6dp"
+ android:text="@string/wipe_media" />
+
+ <CheckBox
+ android:id="@+id/wipecache"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="6dp"
+ android:visibility="gone"
+ android:text="@string/wipe_cache" />
+ <RelativeLayout
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="6dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/update_file_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:textSize="20sp"
+ android:layout_toLeftOf="@+id/btn_locale_certern">
+ </TextView>
+ <TextView
+ android:id="@+id/update_full_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="invisible">
+ </TextView>
+ <Button
+ android:id="@+id/btn_locale_certern"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@+id/btn_update_locale"
+ android:layout_marginRight="30dp"
+ android:layout_alignBaseline="@+id/btn_update_locale"
+ android:text="@string/confirm_update"/>
+ <Button
+ android:id="@+id/btn_update_locale"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_alignParentRight="true"
+ android:text="@string/select" />
+ </RelativeLayout>
+ </LinearLayout>
+ </RelativeLayout>
+ <TextView
+ android:id="@+id/backuptitle"
+ style="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/text_titile_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/update_locale_layer"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="10dp"
+ android:text="@string/backup_title" />
+
+ <View
+ android:id="@+id/divider1"
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_below="@id/backuptitle"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:background="#FFFFFF" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/backup_layout"
+ android:layout_below="@id/divider1"
+ android:layout_centerHorizontal="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="10dp"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:id="@+id/backup_hit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="2dp"
+ android:layout_marginLeft="20dp"
+ android:text="@string/backup_desc" />
+
+ <Button
+ android:id="@+id/backup"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="60dp"
+ android:layout_marginRight="10dp"
+ android:text="@string/backup" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/divider2"
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_marginBottom="10dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:id="@+id/restore_hit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="2dp"
+ android:layout_marginLeft="20dp"
+ android:text="@string/restore_desc" />
+
+ <Button
+ android:id="@+id/restore"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="60dp"
+ android:layout_marginRight="10dp"
+ android:text="@string/restore" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/divider3"
+ android:layout_width="fill_parent"
+ android:layout_height="2dp"
+ android:layout_marginBottom="20dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-xhdpi/main_view.xml b/res/layout-xhdpi/main_view.xml
new file mode 100644
index 0000000..a679eb8
--- a/dev/null
+++ b/res/layout-xhdpi/main_view.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <TextView
+ android:id="@+id/updateview"
+ style="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/text_titile_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="10dp"
+ android:text="@string/update_title" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:layout_below="@+id/updateview"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:background="#FFFFFF" />
+
+ <TextView
+ android:id="@+id/updateonline"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/updateview"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="2dp"
+ android:text="@string/update_online" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:layout_below="@+id/updateonline"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+
+ <Button
+ android:id="@+id/updatebtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/updateonline"
+ android:layout_marginRight="20dp"
+ android:layout_marginTop="2dp"
+ android:text="@string/update_online" >
+ </Button>
+ <RelativeLayout
+ android:id="@+id/update_locale_layer"
+ android:layout_width="match_parent"
+ android:layout_below="@+id/updatebtn"
+ android:layout_height="wrap_content" >
+ <TextView
+ android:id="@+id/updatelocale"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:text="@string/update_locale" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:layout_below="@+id/updatelocale"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+
+ <LinearLayout
+ android:id="@+id/showdetail"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/updatelocale"
+ android:layout_centerHorizontal="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="2dp"
+ android:divider="#FFFFFF"
+ android:orientation="vertical" >
+
+ <CheckBox
+ android:id="@+id/wipedata"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="2dp"
+ android:text="@string/wipe_data" />
+
+ <CheckBox
+ android:id="@+id/wipemedia"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="2dp"
+ android:text="@string/wipe_media" />
+
+ <CheckBox
+ android:id="@+id/wipecache"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="2dp"
+ android:visibility="gone"
+ android:text="@string/wipe_cache" />
+ <RelativeLayout
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="2dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/update_file_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:textSize="20sp"
+ android:layout_toLeftOf="@+id/btn_locale_certern">
+ </TextView>
+ <TextView
+ android:id="@+id/update_full_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="invisible">
+ </TextView>
+ <Button
+ android:id="@+id/btn_locale_certern"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@+id/btn_update_locale"
+ android:layout_marginRight="30dp"
+ android:layout_alignBaseline="@+id/btn_update_locale"
+ android:text="@string/confirm_update" />
+ <Button
+ android:id="@+id/btn_update_locale"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_alignParentRight="true"
+ android:text="@string/select" />
+ </RelativeLayout>
+ </LinearLayout>
+ </RelativeLayout>
+ <TextView
+ android:id="@+id/backuptitle"
+ style="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/text_titile_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/update_locale_layer"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="4dp"
+ android:text="@string/backup_title" />
+
+ <View
+ android:id="@+id/divider1"
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_below="@id/backuptitle"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:background="#FFFFFF" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/backup_layout"
+ android:layout_below="@id/divider1"
+ android:layout_centerHorizontal="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="2dp"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:id="@+id/backup_hit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="2dp"
+ android:layout_marginLeft="20dp"
+ android:text="@string/backup_desc" />
+
+ <Button
+ android:id="@+id/backup"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="60dp"
+ android:layout_marginRight="10dp"
+ android:text="@string/backup" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/divider2"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginBottom="10dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:id="@+id/restore_hit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="2dp"
+ android:layout_marginLeft="20dp"
+ android:text="@string/restore_desc" />
+
+ <Button
+ android:id="@+id/restore"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="60dp"
+ android:layout_marginRight="10dp"
+ android:text="@string/restore" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/divider3"
+ android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:layout_marginBottom="20dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#F0ECECEC" />
+</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/file_list.xml b/res/layout/file_list.xml
index 5916b09..7d0d94e 100755
--- a/res/layout/file_list.xml
+++ b/res/layout/file_list.xml
@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
- android:layout_marginTop="10dp" >
+ android:layout_marginTop="20dp" >
<ListView
android:id="@+id/file_list"
diff --git a/res/layout/install_ota.xml b/res/layout/install_ota.xml
index 6c737f0..9124b01 100644
--- a/res/layout/install_ota.xml
+++ b/res/layout/install_ota.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<com.droidlogic.otaupgrade.InstallPackage xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linearLayout1"
- android:layout_width="500dp"
- android:layout_height="350dp"
+ android:layout_width="@dimen/dialog_size"
+ android:layout_height="@dimen/dialog_height"
+ android:paddingLeft="@dimen/padding_dialog"
+ android:paddingRight="@dimen/padding_dialog"
android:background="@drawable/bg"
android:orientation="vertical" >
@@ -11,11 +13,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:background="@color/blanchedalmond"
android:shadowDx="1"
android:shadowDy="1"
android:text="@string/install_ota_help"
- android:textSize="20sp" />
+ android:textSize="@dimen/text_size" />
<RelativeLayout
android:layout_width="match_parent"
@@ -34,21 +35,21 @@
<ProgressBar
android:id="@+id/verify_progress"
style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="400dp"
+ android:layout_width="@dimen/dialog_size"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
- android:layout_marginTop="15dp" />
+ android:layout_marginTop="10dp" />
<LinearLayout
android:id="@+id/output_field"
android:layout_width="match_parent"
- android:layout_height="200dp"
+ android:layout_height="@dimen/dialog_height"
android:background="@color/blanchedalmond"
android:layout_alignLeft="@+id/verify_progress"
android:layout_alignRight="@+id/verify_progress"
android:layout_below="@+id/verify_progress"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="4dp"
android:orientation="vertical" >
</LinearLayout>
@@ -58,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_alignRight="@+id/output_field"
android:layout_below="@+id/output_field"
- android:layout_marginTop="30dp"
+ android:layout_marginTop="10dp"
android:text="@string/confirm_update" />
<Button
@@ -67,7 +68,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/output_field"
android:layout_below="@+id/output_field"
- android:layout_marginTop="30dp"
+ android:layout_marginTop="10dp"
android:text="@string/confirm_cancel" />
</RelativeLayout>
</com.droidlogic.otaupgrade.InstallPackage>
diff --git a/res/layout/large_text.xml b/res/layout/large_text.xml
index c04d716..a34d5a1 100755
--- a/res/layout/large_text.xml
+++ b/res/layout/large_text.xml
@@ -3,5 +3,4 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#000"
- android:textSize="30sp"/> \ No newline at end of file
+ android:textSize="@dimen/text_titile_size"/> \ No newline at end of file
diff --git a/res/layout/main_view.xml b/res/layout/main_view.xml
index 53ec5ca..f97a265 100755
--- a/res/layout/main_view.xml
+++ b/res/layout/main_view.xml
@@ -6,6 +6,7 @@
<TextView
android:id="@+id/updateview"
style="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/text_titile_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -146,6 +147,7 @@
<TextView
android:id="@+id/backuptitle"
style="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/text_titile_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/update_locale_layer"
diff --git a/res/layout/medium_text.xml b/res/layout/medium_text.xml
index 7cefeff..6e3bb55 100755..100644
--- a/res/layout/medium_text.xml
+++ b/res/layout/medium_text.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textColor="@android:color/black"
- android:textSize="16sp">
+ android:layout_height="match_parent"
+ android:textSize="@dimen/text_size">
</TextView> \ No newline at end of file
diff --git a/res/layout/mid.xml b/res/layout/mid.xml
index 2b9e88e..e309c59 100755
--- a/res/layout/mid.xml
+++ b/res/layout/mid.xml
@@ -2,6 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/trans"
+ android:paddingLeft="@dimen/padding_dialog"
+ android:paddingRight="@dimen/padding_dialog"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" >
@@ -39,14 +42,14 @@
android:layout_height="wrap_content"
android:layout_marginLeft="30dip"
android:layout_marginRight="30dip"
- android:textSize="22sp"
- android:layout_marginTop="10dip"
+ android:textSize="@dimen/text_size"
+ android:layout_marginTop="6dip"
android:text="@string/warnning"/>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingTop="40dp"
+ android:paddingTop="20dp"
android:gravity="bottom|center_horizontal">
<Button
@@ -54,26 +57,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:paddingBottom="10dip"
- android:paddingLeft="30dp"
- android:textSize="24sp"
- android:paddingRight="30dp"
- android:paddingTop="10dip"
- android:layout_marginLeft="30dp"
+ android:layout_marginLeft="10dp"
android:text="@string/cancel" />
<Button
android:id="@+id/sdcard_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingBottom="10dip"
- android:paddingLeft="30dp"
- android:paddingRight="30dp"
- android:textSize="24sp"
- android:paddingTop="10dip"
android:layout_alignBaseline="@id/sdcard_cancel"
android:layout_alignParentRight="true"
- android:layout_marginRight="30dp"
+ android:layout_marginRight="10dp"
android:text="@string/sure" />
</RelativeLayout>
diff --git a/res/values-hdpi/dimens.xml b/res/values-hdpi/dimens.xml
new file mode 100644
index 0000000..3e713c2
--- a/dev/null
+++ b/res/values-hdpi/dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <!-- The platform's desired fixed width for a dialog along the major axis
+ (the screen is in landscape). This may be either a fraction or a dimension.-->
+ <dimen name="text_titile_size">24dp</dimen>
+ <!-- The platform's desired fixed width for a dialog along the minor axis
+ (the screen is in portrait). This may be either a fraction or a dimension.-->
+ <dimen name="text_size">18dp</dimen>
+ <dimen name="padding_dialog">18dp</dimen>
+ <dimen name="dialog_size">600dp</dimen>
+ <dimen name="dialog_height">300dp</dimen>
+</resources>
diff --git a/res/values-xhdpi/dimens.xml b/res/values-xhdpi/dimens.xml
new file mode 100644
index 0000000..1d3dcce
--- a/dev/null
+++ b/res/values-xhdpi/dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <!-- The platform's desired fixed width for a dialog along the major axis
+ (the screen is in landscape). This may be either a fraction or a dimension.-->
+ <dimen name="text_titile_size">18dp</dimen>
+ <!-- The platform's desired fixed width for a dialog along the minor axis
+ (the screen is in portrait). This may be either a fraction or a dimension.-->
+ <dimen name="text_size">16dp</dimen>
+ <dimen name="padding_dialog">20dp</dimen>
+ <dimen name="dialog_height">200dp</dimen>
+ <dimen name="dialog_size">400dp</dimen>
+</resources>
diff --git a/res/values/color.xml b/res/values/color.xml
index 9c90ea7..2c88e7a 100755
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -3,8 +3,9 @@
<color name="white" >#FFFFFF</color>
- <color name="blanchedalmond" >#FFFFF0</color>
-
+ <!--<color name="blanchedalmond" >#FFFFF0</color>-->
+ <color name="blanchedalmond" >#EF000000</color>
+ <color name="trans" >#DD000000</color>
<color name="lightyellow" >#FFFFE0</color>
<color name="yellow" >#FFFF00</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 0000000..e5361d5
--- a/dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <!-- The platform's desired fixed width for a dialog along the major axis
+ (the screen is in landscape). This may be either a fraction or a dimension.-->
+ <dimen name="text_titile_size">24dp</dimen>
+ <!-- The platform's desired fixed width for a dialog along the minor axis
+ (the screen is in portrait). This may be either a fraction or a dimension.-->
+ <dimen name="text_size">18dp</dimen>
+ <dimen name="padding_dialog">18dp</dimen>
+ <dimen name="dialog_size">520dp</dimen>
+ <dimen name="dialog_height">200dp</dimen>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a28b34e..99a644d 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1 +1,36 @@
-<resources> <!-- Base application theme, dependent on API level. This theme is replaced by AppBaseTheme from res/values-vXX/styles.xml on newer devices. --> <style name="AppBaseTheme" parent="android:Theme.Holo.Light"> <!-- Theme customizations available in newer API levels can go in res/values-vXX/styles.xml, while customizations related to backward-compatibility can go here. --> </style> <!-- Application theme. --> <style name="AppTheme" parent="AppBaseTheme"> <!-- All customizations that are NOT specific to a particular API-level can go here. --> <item name="android:windowFullscreen">false</item> </style> <style name="WarningDialog" parent="@android:Theme.Dialog"> <item name="android:windowFrame">@null</item> <item name="android:windowNoTitle">true</item> <item name="android:background">@color/white</item> <item name="android:windowIsFloating">true</item> <item name="android:windowContentOverlay">@null</item> </style> <style name="Theme_dialog" parent="@android:style/Theme.Dialog"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowNoTitle">true</item> </style> <style name="dialog" parent="@android:style/Theme.Dialog"> <item name="android:windowFrame">@null</item> <item name="android:windowIsFloating">true</item> <item name="android:windowIsTranslucent">false</item> <item name="android:windowNoTitle">false</item> <item name="android:backgroundDimEnabled">false</item> </style> </resources> \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <style name="AppBaseTheme" parent="android:Theme.Material">
+ </style>
+
+ <style name="AppTheme" parent="AppBaseTheme">
+ <item name="android:textSize">@dimen/text_size</item>
+ <item name="android:windowFullscreen">true</item>
+ <item name="android:windowFrame">@null</item>
+ <item name="android:windowNoTitle">true</item>
+ </style>
+
+ <style name="WarningDialog" parent="@android:Theme.Dialog">
+ <item name="android:windowFrame">@null</item>
+ <item name="android:textSize">@dimen/text_size</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:background">@color/white</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+
+ <style name="Theme_dialog" parent="@android:style/Theme.Dialog">
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:textSize">@dimen/text_size</item>
+ </style>
+
+ <style name="dialog" parent="@android:style/Theme.Dialog">
+ <item name="android:textSize">@dimen/text_size</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowIsTranslucent">false</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:backgroundDimEnabled">true</item>
+ </style>
+</resources> \ No newline at end of file