diff options
| author | Chris Craik <ccraik@google.com> | 2012-10-11 17:14:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-11 17:14:05 -0700 |
| commit | 8e9072b0a95d48caa8b1d9cdb9b385e92c33e292 (patch) | |
| tree | cb5247636bf70ef5ad91b84849e6eb657487cc90 | |
| parent | a4ccb4af475fbabf637dd48bf68db449ea7c8197 (diff) | |
| parent | 09473aa0a53d451c791ca402a343e49cce2c31c5 (diff) | |
| download | android_packages_apps_Gallery2-8e9072b0a95d48caa8b1d9cdb9b385e92c33e292.tar.gz android_packages_apps_Gallery2-8e9072b0a95d48caa8b1d9cdb9b385e92c33e292.tar.bz2 android_packages_apps_Gallery2-8e9072b0a95d48caa8b1d9cdb9b385e92c33e292.zip | |
Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
| -rw-r--r-- | AndroidManifest.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index eda881508..b96042fa2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -288,15 +288,6 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.Gallery.Dialog"/> - <activity android:name="com.android.camera.Camera" - android:taskAffinity="com.android.camera.Camera" - android:label="@string/camera_label" - android:theme="@style/Theme.Camera" - android:configChanges="orientation|screenSize|keyboardHidden" - android:clearTaskOnLaunch="true" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - </activity> - <activity android:name="com.android.camera.CameraActivity" android:taskAffinity="com.android.camera.CameraActivity" android:label="@string/camera_label" @@ -353,6 +344,16 @@ </intent-filter> </activity-alias> + <activity-alias android:icon="@mipmap/ic_launcher_camera" + android:label="@string/camera_label" + android:name="com.android.camera.Camera" + android:targetActivity="com.android.camera.CameraActivity" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity-alias> + <activity android:name="com.android.camera.VideoCamera" android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" |