summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-12 11:49:33 -0700
committerSascha Haeberling <haeberling@google.com>2013-08-12 11:49:54 -0700
commitca4ddcc4b523ecc9d56bc265b2f90621bb4c8781 (patch)
tree298e134754cc729f6eadefd83f4b06ea5b227220 /AndroidManifest.xml
parenta0bd080a978fd7e9a67436b412f929c5b3cf8854 (diff)
downloadandroid_packages_apps_Snap-ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781.tar.gz
android_packages_apps_Snap-ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781.tar.bz2
android_packages_apps_Snap-ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781.zip
Update app name to "Camera" before merging to KLP.
Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cd18989b4..6079b9fb2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,7 +49,7 @@
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/camera_2"
+ android:label="@string/app_name"
android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
@@ -80,7 +80,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/camera_2"
+ android:label="@string/app_name"
android:taskAffinity="com.android.camera.SecureCameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >