diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-17 18:46:21 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-17 18:46:21 -0700 |
| commit | 130a8f8cbfa4d5185b53e782cb25412ae481017e (patch) | |
| tree | 14e2ac55f8d3c2eb368a9a514e3ffe27a6758743 /packages/SubscribedFeedsProvider | |
| parent | 2420186c891bf8aa33ed5e710bfea9e1cd963c84 (diff) | |
| parent | 3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c (diff) | |
| download | frameworks_base-130a8f8cbfa4d5185b53e782cb25412ae481017e.zip frameworks_base-130a8f8cbfa4d5185b53e782cb25412ae481017e.tar.gz frameworks_base-130a8f8cbfa4d5185b53e782cb25412ae481017e.tar.bz2 | |
am 3f4263fa: Merge change 4411 into donut
Merge commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c'
* commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c':
Squashed commit of the following:
Diffstat (limited to 'packages/SubscribedFeedsProvider')
| -rw-r--r-- | packages/SubscribedFeedsProvider/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/SubscribedFeedsProvider/res/values/strings.xml | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/packages/SubscribedFeedsProvider/AndroidManifest.xml b/packages/SubscribedFeedsProvider/AndroidManifest.xml index c254d93..d839c4e 100644 --- a/packages/SubscribedFeedsProvider/AndroidManifest.xml +++ b/packages/SubscribedFeedsProvider/AndroidManifest.xml @@ -10,7 +10,7 @@ <application android:process="system" android:allowClearUserData="false" android:icon="@drawable/app_icon" - android:label="Sync Feeds"> + android:label="@string/app_label"> <uses-library android:name="com.google.android.gtalkservice" /> <provider android:name="SubscribedFeedsProvider" android:authorities="subscribedfeeds" android:syncable="false" diff --git a/packages/SubscribedFeedsProvider/res/values/strings.xml b/packages/SubscribedFeedsProvider/res/values/strings.xml new file mode 100644 index 0000000..072571d --- /dev/null +++ b/packages/SubscribedFeedsProvider/res/values/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <!-- Title of the feed synchronization activity. --> + <string name="app_label">Sync Feeds</string> +</resources> + |