Merge commit 'korg/cupcake'

4 files changed, 33 insertions, 6 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 23b4958..8609528 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,8 @@
             android:writePermission="com.android.providers.im.permission.WRITE_ONLY"
             android:grantUriPermissions="true" />
 
-        <activity android:name=".LandingPage">
+        <activity android:name=".LandingPage"
+                android:enabled="@bool/enableLandingPageActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 89c5700..993dc42 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,8 +19,8 @@
     <string name="ro_perm_desc">"アプリケーションでIMコンテンツプロバイダからデータを読み取れるようにします。"</string>
     <string name="wo_perm_label">"インスタントメッセージを作成"</string>
     <string name="wo_perm_desc">"アプリケーションからIMコンテンツプロバイダにデータを書き込めるようにします。"</string>
-    <string name="im_label">"IM"</string>
-    <string name="landing_page_title">"チャット-アカウントを選択"</string>
+    <string name="im_label">"チャット"</string>
+    <string name="landing_page_title">"チャット: アカウントを選択"</string>
     <string name="menu_add_account">"アカウントを追加"</string>
     <string name="menu_edit_account">"アカウントを編集"</string>
     <string name="menu_remove_account">"アカウントを削除"</string>
@@ -28,9 +28,8 @@
     <string name="menu_sign_out">"ログアウト"</string>
     <string name="menu_settings">"設定"</string>
     <string name="menu_sign_out_all">"すべてログアウト"</string>
-    <string name="choose_account_title">"チャット-アカウントを選択"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="choose_account_title">"チャット: アカウントを選択"</string>
+    <string name="conversations">"（%1$d）"</string>
     <string name="add_account">"<xliff:g id="ACCOUNT">%1$s</xliff:g>アカウントを追加"</string>
     <string name="menu_view_contact_list">"連絡先リスト"</string>
     <string name="signing_in_wait">"ログイン中..."</string>
diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100644
index 0000000..bac58b4
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+    <!-- Flag indicating whether IM app should be shown in the application tray -->
+    <bool name="enableLandingPageActivity">true</bool>
+</resources>
diff --git a/src/com/android/providers/im/ProviderListItem.java b/src/com/android/providers/im/ProviderListItem.java
index f2f0da8..9032e94 100644
--- a/src/com/android/providers/im/ProviderListItem.java
+++ b/src/com/android/providers/im/ProviderListItem.java
@@ -141,6 +141,8 @@ public class ProviderListItem extends LinearLayout {
                         providerName.setTextColor(0xff000000);
                         loginName.setTextColor(0xff000000);
                         chatView.setTextColor(0xff000000);
+                    } else {
+                        chatView.setVisibility(View.GONE);
                     }
                     
                     secondRowText = cursor.getString(mActiveAccountUserNameColumn);