diff options
| author | Yuli Huang <yuli@google.com> | 2011-09-12 22:25:30 +0800 |
|---|---|---|
| committer | Yuli Huang <yuli@google.com> | 2011-09-13 00:36:00 +0800 |
| commit | efd1db011b7c85ffd590ec80f535d95070d4371e (patch) | |
| tree | f1bbd820cb903b5b33cb31d96f213d7d9eb2d054 /res/values/photoeditor_arrays.xml | |
| parent | c5de01adfefd310ef212cf83acba4b16a6354bd9 (diff) | |
| download | android_packages_apps_Snap-efd1db011b7c85ffd590ec80f535d95070d4371e.tar.gz android_packages_apps_Snap-efd1db011b7c85ffd590ec80f535d95070d4371e.tar.bz2 android_packages_apps_Snap-efd1db011b7c85ffd590ec80f535d95070d4371e.zip | |
Fix b/4643148: Make PhotoEditor integrated into Gallery.
1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.
Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
Diffstat (limited to 'res/values/photoeditor_arrays.xml')
| -rw-r--r-- | res/values/photoeditor_arrays.xml | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/res/values/photoeditor_arrays.xml b/res/values/photoeditor_arrays.xml new file mode 100644 index 000000000..4c2721512 --- /dev/null +++ b/res/values/photoeditor_arrays.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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> + <array name="color_picker_colors"> + <item>@color/color_picker_preset_color1</item> + <item>@color/color_picker_preset_color2</item> + <item>@color/color_picker_preset_color3</item> + <item>@color/color_picker_preset_color4</item> + <item>@color/color_picker_preset_color5</item> + <item>@color/color_picker_preset_color6</item> + <item>@color/color_picker_preset_color7</item> + <item>@color/color_picker_preset_color8</item> + <item>@color/color_picker_preset_color9</item> + <item>@color/color_picker_preset_color10</item> + <item>@color/color_picker_preset_color11</item> + <item>@color/color_picker_preset_color12</item> + <item>@color/color_picker_preset_color13</item> + <item>@color/color_picker_preset_color14</item> + <item>@color/color_picker_preset_color15</item> + <item>@color/color_picker_preset_color16</item> + <item>@color/color_picker_preset_color17</item> + <item>@color/color_picker_preset_color18</item> + <item>@color/color_picker_preset_color19</item> + <item>@color/color_picker_preset_color20</item> + <item>@color/color_picker_preset_color21</item> + <item>@color/color_picker_preset_color22</item> + <item>@color/color_picker_preset_color23</item> + <item>@color/color_picker_preset_color24</item> + </array> +</resources> |