summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml8
-rw-r--r--res/values/strings.xml1
2 files changed, 4 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 346971790..e34da9b6e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,7 +39,7 @@
android:backupAgent="com.android.camera.CameraBackupAgent"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/app_name"
+ android:label="@string/camera_label"
android:largeHeap="true"
android:logo="@mipmap/ic_launcher_camera"
android:restoreAnyVersion="true"
@@ -49,7 +49,7 @@
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/app_name"
+ android:label="@string/camera_label"
android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
@@ -84,7 +84,7 @@
<activity-alias
android:name="com.android.camera.CameraLauncher"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/app_name"
+ android:label="@string/camera_label"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -100,7 +100,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/app_name"
+ android:label="@string/camera_label"
android:taskAffinity="com.android.camera.SecureCameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e7e1cf731..131560d79 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,7 +16,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">Camera</string>
-
<!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
<string name="details_ms">%1$02d:%2$02d</string>
<!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->