summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/values/strings.xml5
2 files changed, 3 insertions, 6 deletions
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" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cd0df0548..5336744eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,10 +15,7 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name">Camera++</string>
- <string name="camera_2">Camera++</string>
- <!-- Title for picture frame gadget to show in list of all available gadgets -->
- <string name="gadget_title">Picture frame</string>
+ <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>