summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-06-09 12:49:49 -0700
committerJay Wang <jaywang@codeaurora.org>2016-08-08 12:07:32 -0700
commitf19b070884f491ecae432914131a302876e1fcf6 (patch)
tree2c3ddb4f766e1aa6e390b46f901cacb8183c8533 /res
parent933ff5d0c4124f4e57a08d6e6a18fa1705241dab (diff)
downloadandroid_packages_apps_Gallery2-f19b070884f491ecae432914131a302876e1fcf6.tar.gz
android_packages_apps_Gallery2-f19b070884f491ecae432914131a302876e1fcf6.tar.bz2
android_packages_apps_Gallery2-f19b070884f491ecae432914131a302876e1fcf6.zip
Gallery: Add TruePortrait post proc feature
Add TruePortrait post processing feature to Gallery CRs-Fixed: 1029226 Change-Id: Id7ea0a8f810990952008fc28d30df27421c91d14
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/btn_tp_help.pngbin0 -> 854 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_help_sel.pngbin0 -> 1343 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_sel_bg.pngbin0 -> 722 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_sel_bg_sel.pngbin0 -> 920 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_touchup.pngbin0 -> 712 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_touchup_sel.pngbin0 -> 1156 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_undo.pngbin0 -> 716 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_undo_disabled.pngbin0 -> 742 bytes
-rw-r--r--res/drawable-hdpi/btn_tp_undo_sel.pngbin0 -> 1110 bytes
-rw-r--r--res/drawable-hdpi/ic_brush_size_large.pngbin0 -> 1237 bytes
-rw-r--r--res/drawable-hdpi/ic_brush_size_large_sel.pngbin0 -> 890 bytes
-rw-r--r--res/drawable-hdpi/ic_brush_size_med.pngbin0 -> 781 bytes
-rw-r--r--res/drawable-hdpi/ic_brush_size_med_sel.pngbin0 -> 531 bytes
-rw-r--r--res/drawable-hdpi/ic_brush_size_sm.pngbin0 -> 533 bytes
-rw-r--r--res/drawable-hdpi/ic_brush_size_sm_sel.pngbin0 -> 372 bytes
-rw-r--r--res/drawable-hdpi/ic_tp_bokeh.pngbin0 -> 37030 bytes
-rw-r--r--res/drawable-hdpi/ic_tp_fusion.pngbin0 -> 48694 bytes
-rw-r--r--res/drawable-hdpi/ic_tp_halo.pngbin0 -> 51974 bytes
-rw-r--r--res/drawable-hdpi/ic_tp_motion_blur.pngbin0 -> 36652 bytes
-rw-r--r--res/drawable-hdpi/ic_tp_normal.pngbin0 -> 51977 bytes
-rw-r--r--res/drawable-hdpi/ic_tp_sketch.pngbin0 -> 49368 bytes
-rw-r--r--res/drawable-hdpi/trueportrait.pngbin0 -> 58255 bytes
-rw-r--r--res/drawable-hdpi/trueportrait_disabled.pngbin0 -> 58614 bytes
-rw-r--r--res/drawable-hdpi/trueportrait_select.pngbin0 -> 58795 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_help.pngbin0 -> 1213 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_help_sel.pngbin0 -> 1842 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_sel_bg.pngbin0 -> 941 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_sel_bg_sel.pngbin0 -> 1270 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_touchup.pngbin0 -> 952 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_touchup_sel.pngbin0 -> 1636 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_undo.pngbin0 -> 943 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_undo_disabled.pngbin0 -> 1001 bytes
-rw-r--r--res/drawable-xhdpi/btn_tp_undo_sel.pngbin0 -> 1511 bytes
-rw-r--r--res/drawable-xhdpi/ic_brush_size_large.pngbin0 -> 1597 bytes
-rw-r--r--res/drawable-xhdpi/ic_brush_size_large_sel.pngbin0 -> 1241 bytes
-rw-r--r--res/drawable-xhdpi/ic_brush_size_med.pngbin0 -> 795 bytes
-rw-r--r--res/drawable-xhdpi/ic_brush_size_med_sel.pngbin0 -> 638 bytes
-rw-r--r--res/drawable-xhdpi/ic_brush_size_sm.pngbin0 -> 651 bytes
-rw-r--r--res/drawable-xhdpi/ic_brush_size_sm_sel.pngbin0 -> 448 bytes
-rw-r--r--res/drawable-xhdpi/ic_tp_bokeh.pngbin0 -> 45905 bytes
-rw-r--r--res/drawable-xhdpi/ic_tp_fusion.pngbin0 -> 67647 bytes
-rw-r--r--res/drawable-xhdpi/ic_tp_halo.pngbin0 -> 75522 bytes
-rw-r--r--res/drawable-xhdpi/ic_tp_motion_blur.pngbin0 -> 46375 bytes
-rw-r--r--res/drawable-xhdpi/ic_tp_normal.pngbin0 -> 76013 bytes
-rw-r--r--res/drawable-xhdpi/ic_tp_sketch.pngbin0 -> 69590 bytes
-rw-r--r--res/drawable-xhdpi/trueportrait.pngbin0 -> 58524 bytes
-rw-r--r--res/drawable-xhdpi/trueportrait_disabled.pngbin0 -> 58866 bytes
-rw-r--r--res/drawable-xhdpi/trueportrait_select.pngbin0 -> 59073 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_help.pngbin0 -> 1880 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_help_sel.pngbin0 -> 2768 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_sel_bg.pngbin0 -> 1438 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_sel_bg_sel.pngbin0 -> 1868 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_touchup.pngbin0 -> 1501 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_touchup_sel.pngbin0 -> 2535 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_undo.pngbin0 -> 1488 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_undo_disabled.pngbin0 -> 1551 bytes
-rw-r--r--res/drawable-xxhdpi/btn_tp_undo_sel.pngbin0 -> 2241 bytes
-rw-r--r--res/drawable-xxhdpi/ic_brush_size_large.pngbin0 -> 2435 bytes
-rw-r--r--res/drawable-xxhdpi/ic_brush_size_large_sel.pngbin0 -> 1981 bytes
-rw-r--r--res/drawable-xxhdpi/ic_brush_size_med.pngbin0 -> 1322 bytes
-rw-r--r--res/drawable-xxhdpi/ic_brush_size_med_sel.pngbin0 -> 998 bytes
-rw-r--r--res/drawable-xxhdpi/ic_brush_size_sm.pngbin0 -> 943 bytes
-rw-r--r--res/drawable-xxhdpi/ic_brush_size_sm_sel.pngbin0 -> 672 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tp_bokeh.pngbin0 -> 70112 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tp_fusion.pngbin0 -> 116296 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tp_halo.pngbin0 -> 139051 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tp_motion_blur.pngbin0 -> 69133 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tp_normal.pngbin0 -> 140407 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tp_sketch.pngbin0 -> 120209 bytes
-rw-r--r--res/drawable-xxhdpi/trueportrait.pngbin0 -> 59078 bytes
-rw-r--r--res/drawable-xxhdpi/trueportrait_disabled.pngbin0 -> 59331 bytes
-rw-r--r--res/drawable-xxhdpi/trueportrait_select.pngbin0 -> 59595 bytes
-rw-r--r--res/drawable/tp_bg_select.xml34
-rw-r--r--res/drawable/tp_brush_large.xml34
-rw-r--r--res/drawable/tp_brush_med.xml34
-rw-r--r--res/drawable/tp_brush_sm.xml34
-rw-r--r--res/drawable/tp_help.xml34
-rw-r--r--res/drawable/tp_touch_up.xml34
-rw-r--r--res/drawable/tp_undo.xml35
-rw-r--r--res/drawable/trueportrait_background.xml35
-rw-r--r--res/layout/do_not_show_again_dialog.xml48
-rw-r--r--res/layout/filtershow_actionbar_trueportrait.xml46
-rw-r--r--res/layout/filtershow_actionbar_trueportrait_fusion.xml56
-rw-r--r--res/layout/filtershow_actionbar_trueportrait_mask.xml80
-rw-r--r--res/layout/filtershow_bottom_panel.xml10
-rw-r--r--res/layout/filtershow_seekbar.xml32
-rw-r--r--res/layout/filtershow_trueportrait_editor_panel.xml96
-rw-r--r--res/layout/filtershow_trueportrait_mask_editor.xml44
-rw-r--r--res/raw/sketch_bm.jpgbin0 -> 402989 bytes
-rw-r--r--res/values/filtershow_ids.xml4
-rw-r--r--res/values/filtershow_strings.xml24
91 files changed, 697 insertions, 17 deletions
diff --git a/res/drawable-hdpi/btn_tp_help.png b/res/drawable-hdpi/btn_tp_help.png
new file mode 100644
index 000000000..77c9a5735
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_help.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_help_sel.png b/res/drawable-hdpi/btn_tp_help_sel.png
new file mode 100644
index 000000000..80893dd5f
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_help_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_sel_bg.png b/res/drawable-hdpi/btn_tp_sel_bg.png
new file mode 100644
index 000000000..2560ec38a
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_sel_bg.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_sel_bg_sel.png b/res/drawable-hdpi/btn_tp_sel_bg_sel.png
new file mode 100644
index 000000000..f2170e1f9
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_sel_bg_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_touchup.png b/res/drawable-hdpi/btn_tp_touchup.png
new file mode 100644
index 000000000..cd450a767
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_touchup.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_touchup_sel.png b/res/drawable-hdpi/btn_tp_touchup_sel.png
new file mode 100644
index 000000000..6b8f18c6c
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_touchup_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_undo.png b/res/drawable-hdpi/btn_tp_undo.png
new file mode 100644
index 000000000..de3edd118
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_undo.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_undo_disabled.png b/res/drawable-hdpi/btn_tp_undo_disabled.png
new file mode 100644
index 000000000..e45d76157
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_undo_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_tp_undo_sel.png b/res/drawable-hdpi/btn_tp_undo_sel.png
new file mode 100644
index 000000000..1d2e5aed1
--- /dev/null
+++ b/res/drawable-hdpi/btn_tp_undo_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_brush_size_large.png b/res/drawable-hdpi/ic_brush_size_large.png
new file mode 100644
index 000000000..e67f63d0b
--- /dev/null
+++ b/res/drawable-hdpi/ic_brush_size_large.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_brush_size_large_sel.png b/res/drawable-hdpi/ic_brush_size_large_sel.png
new file mode 100644
index 000000000..c787f8793
--- /dev/null
+++ b/res/drawable-hdpi/ic_brush_size_large_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_brush_size_med.png b/res/drawable-hdpi/ic_brush_size_med.png
new file mode 100644
index 000000000..7dc3cd181
--- /dev/null
+++ b/res/drawable-hdpi/ic_brush_size_med.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_brush_size_med_sel.png b/res/drawable-hdpi/ic_brush_size_med_sel.png
new file mode 100644
index 000000000..71b521856
--- /dev/null
+++ b/res/drawable-hdpi/ic_brush_size_med_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_brush_size_sm.png b/res/drawable-hdpi/ic_brush_size_sm.png
new file mode 100644
index 000000000..afb691741
--- /dev/null
+++ b/res/drawable-hdpi/ic_brush_size_sm.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_brush_size_sm_sel.png b/res/drawable-hdpi/ic_brush_size_sm_sel.png
new file mode 100644
index 000000000..12601ed99
--- /dev/null
+++ b/res/drawable-hdpi/ic_brush_size_sm_sel.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tp_bokeh.png b/res/drawable-hdpi/ic_tp_bokeh.png
new file mode 100644
index 000000000..c63cf48cb
--- /dev/null
+++ b/res/drawable-hdpi/ic_tp_bokeh.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tp_fusion.png b/res/drawable-hdpi/ic_tp_fusion.png
new file mode 100644
index 000000000..8df5c0c94
--- /dev/null
+++ b/res/drawable-hdpi/ic_tp_fusion.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tp_halo.png b/res/drawable-hdpi/ic_tp_halo.png
new file mode 100644
index 000000000..5754b1ba5
--- /dev/null
+++ b/res/drawable-hdpi/ic_tp_halo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tp_motion_blur.png b/res/drawable-hdpi/ic_tp_motion_blur.png
new file mode 100644
index 000000000..be21d3c9d
--- /dev/null
+++ b/res/drawable-hdpi/ic_tp_motion_blur.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tp_normal.png b/res/drawable-hdpi/ic_tp_normal.png
new file mode 100644
index 000000000..f33eb20a7
--- /dev/null
+++ b/res/drawable-hdpi/ic_tp_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tp_sketch.png b/res/drawable-hdpi/ic_tp_sketch.png
new file mode 100644
index 000000000..10aa56063
--- /dev/null
+++ b/res/drawable-hdpi/ic_tp_sketch.png
Binary files differ
diff --git a/res/drawable-hdpi/trueportrait.png b/res/drawable-hdpi/trueportrait.png
new file mode 100644
index 000000000..902ffaf5f
--- /dev/null
+++ b/res/drawable-hdpi/trueportrait.png
Binary files differ
diff --git a/res/drawable-hdpi/trueportrait_disabled.png b/res/drawable-hdpi/trueportrait_disabled.png
new file mode 100644
index 000000000..8708a24d9
--- /dev/null
+++ b/res/drawable-hdpi/trueportrait_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/trueportrait_select.png b/res/drawable-hdpi/trueportrait_select.png
new file mode 100644
index 000000000..6c2e8dd4d
--- /dev/null
+++ b/res/drawable-hdpi/trueportrait_select.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_help.png b/res/drawable-xhdpi/btn_tp_help.png
new file mode 100644
index 000000000..c8bee80d7
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_help.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_help_sel.png b/res/drawable-xhdpi/btn_tp_help_sel.png
new file mode 100644
index 000000000..b5c70a6f3
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_help_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_sel_bg.png b/res/drawable-xhdpi/btn_tp_sel_bg.png
new file mode 100644
index 000000000..a905e64f2
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_sel_bg.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_sel_bg_sel.png b/res/drawable-xhdpi/btn_tp_sel_bg_sel.png
new file mode 100644
index 000000000..cdad80b15
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_sel_bg_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_touchup.png b/res/drawable-xhdpi/btn_tp_touchup.png
new file mode 100644
index 000000000..764042c9b
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_touchup.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_touchup_sel.png b/res/drawable-xhdpi/btn_tp_touchup_sel.png
new file mode 100644
index 000000000..93f9ef347
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_touchup_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_undo.png b/res/drawable-xhdpi/btn_tp_undo.png
new file mode 100644
index 000000000..6cb11713f
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_undo.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_undo_disabled.png b/res/drawable-xhdpi/btn_tp_undo_disabled.png
new file mode 100644
index 000000000..937957e29
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_undo_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_tp_undo_sel.png b/res/drawable-xhdpi/btn_tp_undo_sel.png
new file mode 100644
index 000000000..c5ef8e783
--- /dev/null
+++ b/res/drawable-xhdpi/btn_tp_undo_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_brush_size_large.png b/res/drawable-xhdpi/ic_brush_size_large.png
new file mode 100644
index 000000000..4bd4db72c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_brush_size_large.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_brush_size_large_sel.png b/res/drawable-xhdpi/ic_brush_size_large_sel.png
new file mode 100644
index 000000000..c96e76b4b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_brush_size_large_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_brush_size_med.png b/res/drawable-xhdpi/ic_brush_size_med.png
new file mode 100644
index 000000000..37a0f6a2c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_brush_size_med.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_brush_size_med_sel.png b/res/drawable-xhdpi/ic_brush_size_med_sel.png
new file mode 100644
index 000000000..44da98afa
--- /dev/null
+++ b/res/drawable-xhdpi/ic_brush_size_med_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_brush_size_sm.png b/res/drawable-xhdpi/ic_brush_size_sm.png
new file mode 100644
index 000000000..d46aba34e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_brush_size_sm.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_brush_size_sm_sel.png b/res/drawable-xhdpi/ic_brush_size_sm_sel.png
new file mode 100644
index 000000000..95fc19810
--- /dev/null
+++ b/res/drawable-xhdpi/ic_brush_size_sm_sel.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tp_bokeh.png b/res/drawable-xhdpi/ic_tp_bokeh.png
new file mode 100644
index 000000000..b1d9cc93f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tp_bokeh.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tp_fusion.png b/res/drawable-xhdpi/ic_tp_fusion.png
new file mode 100644
index 000000000..075eaaf56
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tp_fusion.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tp_halo.png b/res/drawable-xhdpi/ic_tp_halo.png
new file mode 100644
index 000000000..30eb7d991
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tp_halo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tp_motion_blur.png b/res/drawable-xhdpi/ic_tp_motion_blur.png
new file mode 100644
index 000000000..ba0e1737c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tp_motion_blur.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tp_normal.png b/res/drawable-xhdpi/ic_tp_normal.png
new file mode 100644
index 000000000..de667bf3a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tp_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tp_sketch.png b/res/drawable-xhdpi/ic_tp_sketch.png
new file mode 100644
index 000000000..fa014348e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tp_sketch.png
Binary files differ
diff --git a/res/drawable-xhdpi/trueportrait.png b/res/drawable-xhdpi/trueportrait.png
new file mode 100644
index 000000000..17f1ba425
--- /dev/null
+++ b/res/drawable-xhdpi/trueportrait.png
Binary files differ
diff --git a/res/drawable-xhdpi/trueportrait_disabled.png b/res/drawable-xhdpi/trueportrait_disabled.png
new file mode 100644
index 000000000..c0858e1f7
--- /dev/null
+++ b/res/drawable-xhdpi/trueportrait_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/trueportrait_select.png b/res/drawable-xhdpi/trueportrait_select.png
new file mode 100644
index 000000000..a334b2ad9
--- /dev/null
+++ b/res/drawable-xhdpi/trueportrait_select.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_help.png b/res/drawable-xxhdpi/btn_tp_help.png
new file mode 100644
index 000000000..95732571e
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_help.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_help_sel.png b/res/drawable-xxhdpi/btn_tp_help_sel.png
new file mode 100644
index 000000000..554774cf9
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_help_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_sel_bg.png b/res/drawable-xxhdpi/btn_tp_sel_bg.png
new file mode 100644
index 000000000..8d6eea054
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_sel_bg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_sel_bg_sel.png b/res/drawable-xxhdpi/btn_tp_sel_bg_sel.png
new file mode 100644
index 000000000..f0e53af56
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_sel_bg_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_touchup.png b/res/drawable-xxhdpi/btn_tp_touchup.png
new file mode 100644
index 000000000..4113cb796
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_touchup.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_touchup_sel.png b/res/drawable-xxhdpi/btn_tp_touchup_sel.png
new file mode 100644
index 000000000..52acfba68
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_touchup_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_undo.png b/res/drawable-xxhdpi/btn_tp_undo.png
new file mode 100644
index 000000000..448608d0b
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_undo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_undo_disabled.png b/res/drawable-xxhdpi/btn_tp_undo_disabled.png
new file mode 100644
index 000000000..71270ae31
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_undo_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_tp_undo_sel.png b/res/drawable-xxhdpi/btn_tp_undo_sel.png
new file mode 100644
index 000000000..25a20987d
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_tp_undo_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_brush_size_large.png b/res/drawable-xxhdpi/ic_brush_size_large.png
new file mode 100644
index 000000000..6b91b53c8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_brush_size_large.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_brush_size_large_sel.png b/res/drawable-xxhdpi/ic_brush_size_large_sel.png
new file mode 100644
index 000000000..9371f3062
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_brush_size_large_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_brush_size_med.png b/res/drawable-xxhdpi/ic_brush_size_med.png
new file mode 100644
index 000000000..8a7e9e1a8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_brush_size_med.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_brush_size_med_sel.png b/res/drawable-xxhdpi/ic_brush_size_med_sel.png
new file mode 100644
index 000000000..d02b0c087
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_brush_size_med_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_brush_size_sm.png b/res/drawable-xxhdpi/ic_brush_size_sm.png
new file mode 100644
index 000000000..5757c9581
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_brush_size_sm.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_brush_size_sm_sel.png b/res/drawable-xxhdpi/ic_brush_size_sm_sel.png
new file mode 100644
index 000000000..28829b209
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_brush_size_sm_sel.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tp_bokeh.png b/res/drawable-xxhdpi/ic_tp_bokeh.png
new file mode 100644
index 000000000..598e7d42e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tp_bokeh.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tp_fusion.png b/res/drawable-xxhdpi/ic_tp_fusion.png
new file mode 100644
index 000000000..59daba460
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tp_fusion.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tp_halo.png b/res/drawable-xxhdpi/ic_tp_halo.png
new file mode 100644
index 000000000..2f608765c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tp_halo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tp_motion_blur.png b/res/drawable-xxhdpi/ic_tp_motion_blur.png
new file mode 100644
index 000000000..2b88c9bf0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tp_motion_blur.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tp_normal.png b/res/drawable-xxhdpi/ic_tp_normal.png
new file mode 100644
index 000000000..2a153ff4c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tp_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tp_sketch.png b/res/drawable-xxhdpi/ic_tp_sketch.png
new file mode 100644
index 000000000..cbc7d7b5a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tp_sketch.png
Binary files differ
diff --git a/res/drawable-xxhdpi/trueportrait.png b/res/drawable-xxhdpi/trueportrait.png
new file mode 100644
index 000000000..3b46c8086
--- /dev/null
+++ b/res/drawable-xxhdpi/trueportrait.png
Binary files differ
diff --git a/res/drawable-xxhdpi/trueportrait_disabled.png b/res/drawable-xxhdpi/trueportrait_disabled.png
new file mode 100644
index 000000000..93d4926ff
--- /dev/null
+++ b/res/drawable-xxhdpi/trueportrait_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/trueportrait_select.png b/res/drawable-xxhdpi/trueportrait_select.png
new file mode 100644
index 000000000..d5c3b5d9d
--- /dev/null
+++ b/res/drawable-xxhdpi/trueportrait_select.png
Binary files differ
diff --git a/res/drawable/tp_bg_select.xml b/res/drawable/tp_bg_select.xml
new file mode 100644
index 000000000..bc3017740
--- /dev/null
+++ b/res/drawable/tp_bg_select.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/btn_tp_sel_bg" android:state_selected="false"></item>
+ <item android:drawable="@drawable/btn_tp_sel_bg_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/tp_brush_large.xml b/res/drawable/tp_brush_large.xml
new file mode 100644
index 000000000..3277b933d
--- /dev/null
+++ b/res/drawable/tp_brush_large.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_brush_size_large" android:state_selected="false"></item>
+ <item android:drawable="@drawable/ic_brush_size_large_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/tp_brush_med.xml b/res/drawable/tp_brush_med.xml
new file mode 100644
index 000000000..fceff8b9a
--- /dev/null
+++ b/res/drawable/tp_brush_med.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_brush_size_med" android:state_selected="false"></item>
+ <item android:drawable="@drawable/ic_brush_size_med_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/tp_brush_sm.xml b/res/drawable/tp_brush_sm.xml
new file mode 100644
index 000000000..88de16828
--- /dev/null
+++ b/res/drawable/tp_brush_sm.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_brush_size_sm" android:state_selected="false"></item>
+ <item android:drawable="@drawable/ic_brush_size_sm_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/tp_help.xml b/res/drawable/tp_help.xml
new file mode 100644
index 000000000..07a126e44
--- /dev/null
+++ b/res/drawable/tp_help.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/btn_tp_help" android:state_selected="false"></item>
+ <item android:drawable="@drawable/btn_tp_help_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/tp_touch_up.xml b/res/drawable/tp_touch_up.xml
new file mode 100644
index 000000000..b8c1a9472
--- /dev/null
+++ b/res/drawable/tp_touch_up.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/btn_tp_touchup" android:state_selected="false"></item>
+ <item android:drawable="@drawable/btn_tp_touchup_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/tp_undo.xml b/res/drawable/tp_undo.xml
new file mode 100644
index 000000000..146d5b841
--- /dev/null
+++ b/res/drawable/tp_undo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/btn_tp_undo_disabled" android:state_enabled="false"></item>
+ <item android:drawable="@drawable/btn_tp_undo" android:state_selected="false"></item>
+ <item android:drawable="@drawable/btn_tp_undo_sel" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/drawable/trueportrait_background.xml b/res/drawable/trueportrait_background.xml
new file mode 100644
index 000000000..b209b84f2
--- /dev/null
+++ b/res/drawable/trueportrait_background.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/trueportrait_disabled" android:state_enabled="false"></item>
+ <item android:drawable="@drawable/trueportrait" android:state_selected="false"></item>
+ <item android:drawable="@drawable/trueportrait_select" android:state_selected="true"></item>
+</selector> \ No newline at end of file
diff --git a/res/layout/do_not_show_again_dialog.xml b/res/layout/do_not_show_again_dialog.xml
new file mode 100644
index 000000000..8ddfdc191
--- /dev/null
+++ b/res/layout/do_not_show_again_dialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp" />
+
+ <CheckBox
+ android:id="@+id/do_not_show_chk"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:text="@string/do_not_show_again" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/filtershow_actionbar_trueportrait.xml b/res/layout/filtershow_actionbar_trueportrait.xml
new file mode 100644
index 000000000..11e81a83f
--- /dev/null
+++ b/res/layout/filtershow_actionbar_trueportrait.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/editMask"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:background="@android:color/transparent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:src="@drawable/tp_touch_up" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/filtershow_actionbar_trueportrait_fusion.xml b/res/layout/filtershow_actionbar_trueportrait_fusion.xml
new file mode 100644
index 000000000..44e151b01
--- /dev/null
+++ b/res/layout/filtershow_actionbar_trueportrait_fusion.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/pick_underlay"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:background="@android:color/transparent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:src="@drawable/tp_bg_select" />
+
+ <ImageButton
+ android:id="@+id/editMask"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_toLeftOf="@id/pick_underlay"
+ android:background="@android:color/transparent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:src="@drawable/tp_touch_up" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/filtershow_actionbar_trueportrait_mask.xml b/res/layout/filtershow_actionbar_trueportrait_mask.xml
new file mode 100644
index 000000000..b922dbd2d
--- /dev/null
+++ b/res/layout/filtershow_actionbar_trueportrait_mask.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/maskUndo"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:background="@android:color/transparent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:src="@drawable/tp_undo" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true" >
+
+ <ToggleButton
+ android:id="@+id/maskForeground"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:textOff="@string/foreground"
+ android:textOn="@string/foreground" />
+
+ <ToggleButton
+ android:id="@+id/maskBackground"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:textOff="@string/background"
+ android:textOn="@string/background" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/maskHelp"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:background="@android:color/transparent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:src="@drawable/tp_help" />
+
+</RelativeLayout>
diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml
index 81a9d967b..f7c220833 100644
--- a/res/layout/filtershow_bottom_panel.xml
+++ b/res/layout/filtershow_bottom_panel.xml
@@ -134,5 +134,15 @@
android:padding="2dip"
android:scaleType="centerInside"
android:src="@drawable/seestraight" />
+
+ <ImageButton
+ android:id="@+id/truePortraitButton"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="@android:color/transparent"
+ android:padding="2dip"
+ android:scaleType="centerInside"
+ android:src="@drawable/trueportrait_background" />
</LinearLayout>
</com.android.gallery3d.filtershow.CenteredLinearLayout> \ No newline at end of file
diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml
index 8cb5cd979..12f8a7cbb 100644
--- a/res/layout/filtershow_seekbar.xml
+++ b/res/layout/filtershow_seekbar.xml
@@ -15,12 +15,11 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@android:style/Theme.DeviceDefault"
android:id="@+id/top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
android:visibility="visible" >
<ImageButton
@@ -28,26 +27,27 @@
android:layout_width="60dp"
android:layout_height="60dp"
android:src="@drawable/cancel"
- android:layout_gravity="center_vertical"
+ android:layout_centerVertical="true"
+ android:layout_alignParentLeft="true"
android:background="?android:attr/actionBarItemBackground" />
- <SeekBar
- android:id="@+id/primarySeekBar"
- style="@style/FilterShowSlider"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_vertical|center_horizontal"
- android:layout_toRightOf="@+id/tvFilterName"
- android:layout_marginStart="10dp"
- android:layout_marginEnd="10dp"
- android:layout_weight="1" />
-
<ImageButton
android:id="@+id/slider_save"
android:layout_width="60dp"
android:layout_height="60dp"
android:src="@drawable/done"
- android:layout_gravity="center_vertical"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
android:background="?android:attr/actionBarItemBackground" />
-</LinearLayout>
+ <SeekBar
+ android:id="@+id/primarySeekBar"
+ style="@style/FilterShowSlider"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@id/slider_cancel"
+ android:layout_toLeftOf="@id/slider_save"
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp"/>
+</RelativeLayout>
diff --git a/res/layout/filtershow_trueportrait_editor_panel.xml b/res/layout/filtershow_trueportrait_editor_panel.xml
new file mode 100644
index 000000000..13b8212ac
--- /dev/null
+++ b/res/layout/filtershow_trueportrait_editor_panel.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/transparent"
+ android:orientation="vertical" >
+
+ <FrameLayout
+ android:id="@+id/bottom_panel"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/category_actionbar_panel_height"
+ android:background="@color/edit_actionbar_background" >
+
+ <ImageButton
+ android:id="@+id/cancel"
+ android:layout_width="@dimen/category_actionbar_panel_height"
+ android:layout_height="@dimen/category_actionbar_panel_height"
+ android:background="@color/edit_actionbar_background"
+ android:src="@drawable/cancel" />
+
+ <LinearLayout
+ android:id="@+id/brush_size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:clickable="true">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:padding="3dp"
+ android:text="@string/brush_size"
+ android:textColor="#fff"
+ android:textSize="16sp" />
+ <ImageView
+ android:id="@+id/brush_size_sm"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:padding="3dp"
+ android:src="@drawable/tp_brush_sm" />
+ <ImageView
+ android:id="@+id/brush_size_med"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:padding="3dp"
+ android:src="@drawable/tp_brush_med" />
+ <ImageView
+ android:id="@+id/brush_size_large"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:padding="3dp"
+ android:src="@drawable/tp_brush_large" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/done"
+ android:layout_width="@dimen/category_actionbar_panel_height"
+ android:layout_height="@dimen/category_actionbar_panel_height"
+ android:layout_gravity="right"
+ android:background="@color/edit_actionbar_background"
+ android:src="@drawable/done" />
+ </FrameLayout>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/filtershow_trueportrait_mask_editor.xml b/res/layout/filtershow_trueportrait_mask_editor.xml
new file mode 100644
index 000000000..1de55d83c
--- /dev/null
+++ b/res/layout/filtershow_trueportrait_mask_editor.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d"
+ android:id="@+id/truePortraitMaskEditor"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/category_actionbar_panel_height"
+ android:paddingTop="@dimen/category_actionbar_panel_height" >
+
+ <com.android.gallery3d.filtershow.imageshow.ImageTruePortraitMask
+ android:id="@+id/imageTruePortraitMask"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+</FrameLayout>
diff --git a/res/raw/sketch_bm.jpg b/res/raw/sketch_bm.jpg
new file mode 100644
index 000000000..a85e96651
--- /dev/null
+++ b/res/raw/sketch_bm.jpg
Binary files differ
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
index 0cd7082a7..8cfb25090 100644
--- a/res/values/filtershow_ids.xml
+++ b/res/values/filtershow_ids.xml
@@ -57,4 +57,8 @@
<item type="id" name="trueScannerEditor" />
<item type="id" name="hazeBusterEditor" />
<item type="id" name="seeStraightEditor" />
+ <item type="id" name="editorTruePortraitBasic" />
+ <item type="id" name="editorTruePortraitImageOnly" />
+ <item type="id" name="editorTruePortraitMask" />
+ <item type="id" name="editorTruePortraitFusion" />
</resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 1a4d2cde5..81b7ba535 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -208,6 +208,10 @@
<string name="sketch">Sketch</string>
<!-- Label for the "halo" dual camera effect [CHAR LIMIT=15] -->
<string name="halo">Halo</string>
+ <!-- Label for the "blur" true portrait effect [CHAR LIMIT=15] -->
+ <string name="blur">Blur</string>
+ <!-- Label for the "motion blur" true portrait effect [CHAR LIMIT=15] -->
+ <string name="motion_blur">Motion Blur</string>
<!-- Label for the Brightness effect [CHAR LIMIT=20] -->
<string name="editor_grad_brightness">Brightness</string>
<!-- Label for the Contrast filter effect [CHAR LIMIT=20] -->
@@ -348,10 +352,28 @@
<string name="fusion_pick_underlay">Pick Underlay</string>
<string name="dualcam_no_segment_toast">No segment found at this point</string>
<string name="dualcam_filter_not_supported">Dual camera filters not supported for this image</string>
+ <string name="trueportrait_intro">Allows you to enhance photos of people. You can apply effects to the background, such "blur" and "sketch". You can also merge two photos together to create interesting backgrounds for your portrait photos.</string>
+ <string name="trueportrait_no_face">True Portrait effects cannot be applied to this photo. Face not detected.</string>
+ <string name="trueportrait_edit_intro">With the Touch-Up tool, you can edit the foreground and the background. You can user your finger to paint in any areas of the foreground or background that were missed.</string>
+ <string name="trueportrait_edit_foreground_toast">Use your finger to paint in any areas of the foreground that were missed.</string>
+ <string name="trueportrait_edit_background_toast">Use your finger to paint in any areas of the background that were missed.</string>
+ <string name="trueportrait_edit_help">To zoom, use two fingers to pinch open or closed. You can also drag with two fingers to re-position the image. This can make it easier to fix any problem areas.</string>
+ <string name="trueportrait_fusion_intro">Your foreground person can be copied and pasted onto any photo in your Gallery. You can try using different background photos to create new and interesting portraits.</string>
+ <string name="do_not_show_again">Do not show again</string>
+ <string name="trueportrait_touch_up">Touch Up</string>
+ <string name="fusion_pick_background">Select Background Photo</string>
<string name="color">Color</string>
<string name="frames">Frames</string>
<string name="beautify">Beautify</string>
<string name="dualcam">Dual Camera</string>
-
+ <string name="trueportrait">True Portrait</string>
+ <string name="foreground">Foreground</string>
+ <string name="background">Background</string>
+ <string name="brush_size">Brush Size</string>
+
+ <string name="pref_trueportrait_intro_show_key" translatable="false">pref_trueportrait_intro_show_key</string>
+ <string name="pref_trueportrait_edit_intro_show_key" translatable="false">pref_trueportrait_edit_intro_show_key</string>
+ <string name="pref_trueportrait_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
+ <string name="pref_trueportrait_fusion_underlay_key" translatable="false">pref_trueportrait_fusion_underlay_key</string>
</resources>