diff options
| author | Owen Lin <owenlin@google.com> | 2010-01-28 16:10:19 -0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2010-02-26 20:26:48 +0800 |
| commit | 4de149ceb47f2c251f646419907424bfb67d2b64 (patch) | |
| tree | 6f48682fe065902039bad89d1f3ca90720eca819 /res/layout | |
| parent | 02627adfa3d240d817e34af69be8d07e9c66c136 (diff) | |
| download | LegacyCamera-4de149ceb47f2c251f646419907424bfb67d2b64.zip LegacyCamera-4de149ceb47f2c251f646419907424bfb67d2b64.tar.gz LegacyCamera-4de149ceb47f2c251f646419907424bfb67d2b64.tar.bz2 | |
The first runnable version of the new UI.
Implement the new UI with OpenGL (GLSurfaceView).
Known issues:
* Texture are never freed from GL
* Do not consider the density of screen. Currently, the dimensions in mdpi
devices are wrong.
* It won't work on Sapphire, bug fired: Bug: 2473605
* The action UP event may pass a wrong target. (It should pass to the same
target who recive the DOWN action.
* Animation is not smooth enough.
* Should not allocate objects into heap during rendering path.
* The scrollbar in GLListView doesn't match the design
* We should calculate our own orientation instead of using the system one.
* Regression: "restore to default settings" is removed
Change-Id: I93fa45831aa87787dd5ee9e43e270a9d786c5a2a
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index d1c1336..1a451f4 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -25,10 +25,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"> - <ImageView android:id="@+id/btn_gripper" - android:background="@drawable/btn_gripper" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> <FrameLayout android:id="@+id/frame" android:layout_width="match_parent" android:layout_height="match_parent" @@ -40,43 +36,10 @@ android:id="@+id/focus_rectangle" android:layout_width="match_parent" android:layout_height="match_parent"/> - <LinearLayout android:id="@+id/indicator_bar" - android:orientation="vertical" - android:visibility="visible" - android:gravity="center" - android:layout_gravity="left|top" - android:layout_marginTop="10dp" - android:layout_marginLeft="10dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <!-- Thsee icons should be in the same order as the - on-screen menu items --> - <com.android.camera.IconIndicator - style="@style/IconIndicator" - android:id="@+id/gps_icon" - camera:modes="@array/gps_modes" - camera:icons="@array/gps_icons"/> - <com.android.camera.IconIndicator - style="@style/IconIndicator" - android:id="@+id/flash_icon" - camera:modes="@array/flash_modes" - camera:icons="@array/flash_icons"/> - <com.android.camera.IconIndicator - style="@style/IconIndicator" - android:id="@+id/scenemode_icon" - camera:modes="@array/scenemode_modes" - camera:icons="@array/scenemode_icons"/> - <com.android.camera.IconIndicator - style="@style/IconIndicator" - android:id="@+id/whitebalance_icon" - camera:modes="@array/pref_camera_whitebalance_entryvalues" - camera:icons="@array/whitebalance_icons"/> - <com.android.camera.IconIndicator - style="@style/IconIndicator" - android:id="@+id/focus_icon" - camera:modes="@array/pref_camera_focusmode_entryvalues" - camera:icons="@array/focusmode_icons"/> - </LinearLayout> + <com.android.camera.ui.GLRootView + android:id="@+id/settings_ui" + android:layout_width="match_parent" + android:layout_height="match_parent"/> </FrameLayout> </com.android.camera.PreviewFrameLayout> </LinearLayout> |