diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-12 11:49:33 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-08-12 11:49:54 -0700 |
| commit | ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781 (patch) | |
| tree | 298e134754cc729f6eadefd83f4b06ea5b227220 | |
| parent | a0bd080a978fd7e9a67436b412f929c5b3cf8854 (diff) | |
| download | android_packages_apps_Snap-ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781.tar.gz android_packages_apps_Snap-ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781.tar.bz2 android_packages_apps_Snap-ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781.zip | |
Update app name to "Camera" before merging to KLP.
Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
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> |