From ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781 Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Mon, 12 Aug 2013 11:49:33 -0700 Subject: Update app name to "Camera" before merging to KLP. Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') 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" > -- cgit v1.2.3