diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-09-03 17:14:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-03 17:14:01 -0700 |
commit | 52a0a4f0be9226fac107346d1010d139f93cc050 (patch) | |
tree | 6a63c4bcafd8b026339d6daab173357aff1546a6 | |
parent | 6d7237f2d34f0d4f9bf24c14dddee123d6caa488 (diff) | |
parent | 26145e56f6e98733569b7093573fc26f44d3cfa5 (diff) | |
download | android_packages_apps_Snap-52a0a4f0be9226fac107346d1010d139f93cc050.tar.gz android_packages_apps_Snap-52a0a4f0be9226fac107346d1010d139f93cc050.tar.bz2 android_packages_apps_Snap-52a0a4f0be9226fac107346d1010d139f93cc050.zip |
am 26145e56: Use app_name label now that we have the correct translations.
* commit '26145e56f6e98733569b7093573fc26f44d3cfa5':
Use app_name label now that we have the correct translations.
-rw-r--r-- | AndroidManifest.xml | 8 |
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" > |