summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-12-06 19:39:55 +0800
committerWu-cheng Li <wuchengli@google.com>2010-12-08 17:21:20 +0800
commit003dd5a52457c024a0f99a2bb222bfc6ad70bbe5 (patch)
tree952554b326cb6c46c59f424c17740bb556fdc905 /res
parent5030bd7b700869feb50083571a680fa55730229b (diff)
downloadpackages_apps_LegacyCamera-003dd5a52457c024a0f99a2bb222bfc6ad70bbe5.zip
packages_apps_LegacyCamera-003dd5a52457c024a0f99a2bb222bfc6ad70bbe5.tar.gz
packages_apps_LegacyCamera-003dd5a52457c024a0f99a2bb222bfc6ad70bbe5.tar.bz2
Add restore default in other settings.
Also change the theme to Holo. bug:3156672 Change-Id: Ied6f2d3543c3a3282c62b2cc31e5cf4cc30c3172
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/other_setting_popup.xml6
-rw-r--r--res/values-xlarge/styles.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index 3927e3d..0a28974 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -58,5 +58,11 @@
style="@style/SettingRow" />
<com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_jpegquality_key"
style="@style/SettingRow" />
+ <TextView
+ android:text="@string/pref_restore_detail"
+ android:gravity="center"
+ android:textSize="22dp"
+ style="@style/SettingRow">
+ </TextView>
</LinearLayout>
</com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 60b1bdd..d394910 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -18,7 +18,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="ThemeCamera" parent="android:Theme.Black.NoTitleBar">
+ <style name="ThemeCamera" parent="android:Theme.Holo.NoActionBar">
<item name="android:windowBackground">@drawable/bg_camera_pattern</item>
</style>
</resources>