diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-14 21:01:35 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-04-09 10:35:50 -0700 |
| commit | fb0636179335a7786ec2c0edf9889a55596db126 (patch) | |
| tree | 1db003d56658bdede651750aeb5fbb550371e271 /AndroidManifest.xml | |
| parent | b1c75f6028ecbf7bd05f945c542da0f848bc594b (diff) | |
| download | android_packages_apps_Gallery2-fb0636179335a7786ec2c0edf9889a55596db126.tar.gz android_packages_apps_Gallery2-fb0636179335a7786ec2c0edf9889a55596db126.tar.bz2 android_packages_apps_Gallery2-fb0636179335a7786ec2c0edf9889a55596db126.zip | |
Work in progress - Put preview in TextureView
Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener
Ongoing: secure album, aspect ratio for video recording on ICS
Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index afee9231b..a918af94a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -290,6 +290,19 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.Gallery.Dialog"/> + <activity android:name="com.android.camera.NewCameraActivity" + android:taskAffinity="com.android.camera.NewCameraActivity" + android:theme="@style/Theme.Camera" + android:label="@string/camera_label" + android:configChanges="orientation|screenSize|keyboardHidden" + android:clearTaskOnLaunch="true" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + <activity android:name="com.android.camera.CameraActivity" android:taskAffinity="com.android.camera.CameraActivity" android:label="@string/camera_label" |