summaryrefslogtreecommitdiffstats
path: root/samples/browseable/Camera2Basic
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2015-08-14 16:18:55 -0700
committerTrevor Johns <trevorjohns@google.com>2015-08-14 16:18:55 -0700
commita56a6341669e1402c23c9d4e1c24337525189c65 (patch)
treef2f4e10ae9bc3aab4beff1a3fb1f5d839d75480b /samples/browseable/Camera2Basic
parent9a9c2ea5f207e3f59f6ede1b91f46121e41200a5 (diff)
downloadandroid_development-a56a6341669e1402c23c9d4e1c24337525189c65.tar.gz
android_development-a56a6341669e1402c23c9d4e1c24337525189c65.tar.bz2
android_development-a56a6341669e1402c23c9d4e1c24337525189c65.zip
Update sample prebuilts to use latest deps
Pulling in dependency changes from //developers/build commit 5d58bc4802 Change-Id: Ie7a807995dc5ffbaa2c0da2cc51795553495196b
Diffstat (limited to 'samples/browseable/Camera2Basic')
-rw-r--r--samples/browseable/Camera2Basic/res/values-v11/template-styles.xml2
-rw-r--r--samples/browseable/Camera2Basic/res/values-v21/base-template-styles.xml2
-rw-r--r--samples/browseable/Camera2Basic/res/values/template-styles.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/samples/browseable/Camera2Basic/res/values-v11/template-styles.xml b/samples/browseable/Camera2Basic/res/values-v11/template-styles.xml
index 8c1ea66f2..f261bb5c2 100644
--- a/samples/browseable/Camera2Basic/res/values-v11/template-styles.xml
+++ b/samples/browseable/Camera2Basic/res/values-v11/template-styles.xml
@@ -17,6 +17,6 @@
<resources>
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Holo.Light" />
+ <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
</resources>
diff --git a/samples/browseable/Camera2Basic/res/values-v21/base-template-styles.xml b/samples/browseable/Camera2Basic/res/values-v21/base-template-styles.xml
index c778e4f98..d838f9829 100644
--- a/samples/browseable/Camera2Basic/res/values-v21/base-template-styles.xml
+++ b/samples/browseable/Camera2Basic/res/values-v21/base-template-styles.xml
@@ -18,7 +18,7 @@
<resources>
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Material.Light">
+ <style name="Theme.Base" parent="@style/Theme.AppCompat.Light">
</style>
</resources>
diff --git a/samples/browseable/Camera2Basic/res/values/template-styles.xml b/samples/browseable/Camera2Basic/res/values/template-styles.xml
index 6e7d593dd..74086d293 100644
--- a/samples/browseable/Camera2Basic/res/values/template-styles.xml
+++ b/samples/browseable/Camera2Basic/res/values/template-styles.xml
@@ -18,7 +18,7 @@
<!-- Activity themes -->
- <style name="Theme.Base" parent="android:Theme.Light" />
+ <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
<style name="Theme.Sample" parent="Theme.Base" />