summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-09-03 17:02:11 -0700
committerSascha Haeberling <haeberling@google.com>2013-09-03 17:02:11 -0700
commit26145e56f6e98733569b7093573fc26f44d3cfa5 (patch)
treea30513da399dac749947b1c0eb9c1c5cda82076e /AndroidManifest.xml
parent269c824d720b2e902c4ad6c3bb23422644da1f41 (diff)
downloadandroid_packages_apps_Snap-26145e56f6e98733569b7093573fc26f44d3cfa5.tar.gz
android_packages_apps_Snap-26145e56f6e98733569b7093573fc26f44d3cfa5.tar.bz2
android_packages_apps_Snap-26145e56f6e98733569b7093573fc26f44d3cfa5.zip
Use app_name label now that we have the correct translations.
Bug: 10509882 Change-Id: I58e7d26afb5636fa156ec22b7c1cfa21262dd9f7
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c5e19164a..1b082e432 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,7 @@
android:backupAgent="com.android.camera.CameraBackupAgent"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/camera_label"
+ android:label="@string/app_name"
android:largeHeap="true"
android:logo="@mipmap/ic_launcher_camera"
android:restoreAnyVersion="true"
@@ -47,7 +47,7 @@
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/camera_label"
+ android:label="@string/app_name"
android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
@@ -82,7 +82,7 @@
<activity-alias
android:name="com.android.camera.CameraLauncher"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/camera_label"
+ android:label="@string/app_name"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -98,7 +98,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/camera_label"
+ android:label="@string/app_name"
android:taskAffinity="com.android.camera.SecureCameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >