diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-09-11 20:30:52 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-09-12 18:10:57 -0700 |
commit | a5a08d7642a1fdf961b057cc90e76c4c93103c15 (patch) | |
tree | b9681bfdc4935424736aec2e6d11e3b0b48e13b1 /res | |
parent | 742cd5b18e1899bee1d430b61891238c0f3502b6 (diff) | |
download | android_packages_apps_Snap-a5a08d7642a1fdf961b057cc90e76c4c93103c15.tar.gz android_packages_apps_Snap-a5a08d7642a1fdf961b057cc90e76c4c93103c15.tar.bz2 android_packages_apps_Snap-a5a08d7642a1fdf961b057cc90e76c4c93103c15.zip |
Bring back tiny planet to the Camera filmstrip
Bug: 10393598
The native code and XmpUtil are mostly 1:1 copies from Gallery2.
The UI is new and should work on all form factors.
Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/tinyplanet_editor.xml | 73 | ||||
-rw-r--r-- | res/values/strings.xml | 10 |
2 files changed, 83 insertions, 0 deletions
diff --git a/res/layout/tinyplanet_editor.xml b/res/layout/tinyplanet_editor.xml new file mode 100644 index 000000000..8880c2cfb --- /dev/null +++ b/res/layout/tinyplanet_editor.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <com.android.camera.tinyplanet.TinyPlanetPreview + android:id="@+id/preview" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_gravity="center_horizontal" + android:layout_weight="1" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:orientation="vertical" > + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tiny_planet_zoom" + android:textColor="#FFF" /> + + <SeekBar + android:id="@+id/zoomSlider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:contentDescription="@string/tiny_planet_zoom" + android:max="1000" + android:progress="500" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:text="@string/tiny_planet_rotate" + android:textColor="#FFF" /> + + <SeekBar + android:id="@+id/angleSlider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:contentDescription="@string/tiny_planet_rotate" + android:max="360" + android:progress="0" /> + + <Button + android:id="@+id/creatTinyPlanetButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:text="@string/create_tiny_planet" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 16a3bedd1..fe4bbfc8c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -625,4 +625,14 @@ CHAR LIMIT = NONE] --> <string name="camera_menu_more_label">MORE OPTIONS</string> <!-- settings label [CHAR LIMIT=50] --> <string name="camera_menu_settings_label">SETTINGS</string> + + <!-- Tiny Planet --> + <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] --> + <string name="create_tiny_planet">Create Tiny Planet</string> + <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] --> + <string name="saving_tiny_planet">Saving Tiny Planet …</string> + <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] --> + <string name="tiny_planet_zoom">Zoom</string> + <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] --> + <string name="tiny_planet_rotate">Rotate</string> </resources> |