summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-08-29 01:42:53 +0300
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commit559aedcfaae62c6be52ec1e3aee7b4dba9244ea8 (patch)
treee48e13e20d581611e1430b272066e1f76b979bad
parent6fc71592903d7ef2ebde90c5da25e56d3fbd7b62 (diff)
downloadandroid_packages_apps_Snap-559aedcfaae62c6be52ec1e3aee7b4dba9244ea8.tar.gz
android_packages_apps_Snap-559aedcfaae62c6be52ec1e3aee7b4dba9244ea8.tar.bz2
android_packages_apps_Snap-559aedcfaae62c6be52ec1e3aee7b4dba9244ea8.zip
Snap: Use AOSP app label
Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
-rw-r--r--AndroidManifest.xml12
-rwxr-xr-xres/values-zh-rCN/strings.xml1
-rw-r--r--res/values/strings.xml1
3 files changed, 6 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8aa6ff7cc..8e25ef89e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,7 +35,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"
@@ -46,7 +46,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="singleTask"
android:logo="@mipmap/ic_launcher_gallery"
android:screenOrientation="portrait"
@@ -103,7 +103,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:parentActivityName="com.android.camera.CameraActivity">
</activity>
@@ -114,14 +114,14 @@
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" >
</activity>
<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>
@@ -138,7 +138,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="singleInstance"
android:logo="@mipmap/ic_launcher_gallery"
android:screenOrientation="portrait"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 715029f3e..e7b67847a 100755
--- 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 b69614d80..604697412 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 -->