From 7e2ade1c5f23678de800df837d4ae9179d29d5e9 Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Wed, 8 Oct 2014 12:27:16 -0700
Subject: Generalize select account dialog for usage anywhere in dialer (1/2)

Currently the select account dialog is specific to InCallUI, but there
are other places in the dialer app that will need the user to select an
account (e.g. MMI pin) so we want to reuse this dialog.
+ Move dialog to ContactsCommon
+ Add a listener to the SelectPhoneAccountDialogFragment class

Bug: 17917937

Change-Id: I872dba36f0f53737398861ff5376cc07f0e11c7b
---
 InCallUI/res/layout/select_account_list_item.xml | 38 ------------------------
 InCallUI/res/values/strings.xml                  |  3 --
 2 files changed, 41 deletions(-)
 delete mode 100644 InCallUI/res/layout/select_account_list_item.xml

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/layout/select_account_list_item.xml b/InCallUI/res/layout/select_account_list_item.xml
deleted file mode 100644
index 1999fced7..000000000
--- a/InCallUI/res/layout/select_account_list_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
-<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="4dp" >
-
-    <ImageView android:id="@+id/icon"
-               android:layout_width="48dp"
-               android:layout_height="48dp"
-               android:tint="@color/dialtacts_secondary_text_color"
-               android:scaleType="center" />
-
-    <TextView android:id="@+id/text"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:gravity="start|center_vertical"
-              android:layout_marginLeft="8dp"
-              android:layout_width="0dp"
-              android:layout_weight="1"
-              android:layout_height="match_parent" />
-</view>
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 8e8a8e2bd..320da1964 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -546,7 +546,4 @@
 
     <!-- This can be used in any application wanting to disable the text "Emergency number" -->
     <string name="emergency_call_dialog_number_for_display">Emergency number</string>
-
-    <!-- Title for Select Account Dialog [CHAR LIMIT=30] -->
-    <string name="select_account_dialog_title">Select Account</string>
 </resources>
-- 
cgit v1.2.3