summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-08-29 01:42:53 +0300
committerMichael Bestas <mikeioannina@gmail.com>2015-08-29 04:15:51 +0300
commit55178e0f375c17c78181438b549c0cd3881e2178 (patch)
treebd0f4e29eb9f1e79e76d66d4e4151d46383a64a3
parentf5a3d8f73023a437cea83bbb87e3fb99ac194d81 (diff)
downloadandroid_packages_apps_Snap-55178e0f375c17c78181438b549c0cd3881e2178.tar.gz
android_packages_apps_Snap-55178e0f375c17c78181438b549c0cd3881e2178.tar.bz2
android_packages_apps_Snap-55178e0f375c17c78181438b549c0cd3881e2178.zip
Snap: Use AOSP app label
Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
-rw-r--r--AndroidManifest.xml8
-rw-r--r--res/values-zh-rCN/strings.xml1
-rw-r--r--res/values/strings.xml1
3 files changed, 4 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97b8cf7aa..01211061f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -45,7 +45,7 @@
android:name="com.android.camera.app.CameraApp"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/snapcam_app_name"
+ android:label="@string/app_name"
android:largeHeap="true"
android:logo="@mipmap/ic_launcher_camera"
android:restoreAnyVersion="true"
@@ -56,7 +56,7 @@
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/snapcam_app_name"
+ android:label="@string/app_name"
android:launchMode="singleTop"
android:logo="@mipmap/ic_launcher_gallery"
android:screenOrientation="portrait"
@@ -84,7 +84,7 @@
<activity-alias
android:name="com.android.camera.CameraLauncher"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/snapcam_app_name"
+ android:label="@string/app_name"
android:launchMode="singleTop"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
@@ -118,7 +118,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"
android:icon="@mipmap/ic_launcher_camera"
- android:label="@string/snapcam_app_name"
+ android:label="@string/app_name"
android:launchMode="singleTop"
android:logo="@mipmap/ic_launcher_gallery"
android:taskAffinity="com.android.camera.SecureCameraActivity"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 37128e275..47bc62f25 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,7 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="1175086483881127797">"相机"</string>
- <string name="snapcam_app_name">骁龙相机</string>
<string name="video_camera_label" msgid="1723708322021743770">"摄像机"</string>
<string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b9502322a..22f36f5f6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,7 +17,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
<string name="app_name">Camera</string>
- <string name="snapcam_app_name">Snapdragon Camera</string>
<!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
<string name="video_camera_label">Camcorder</string>
<!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->