Merge "Import translations. DO NOT MERGE"
diff --git a/res/layout-land/compact_contact_editor_fragment.xml b/res/layout-land/compact_contact_editor_fragment.xml
index 09bb5bb..4f333bd 100644
--- a/res/layout-land/compact_contact_editor_fragment.xml
+++ b/res/layout-land/compact_contact_editor_fragment.xml
@@ -44,8 +44,7 @@
android:orientation="vertical">
<include layout="@layout/editor_all_rawcontacts_accounts_selector" />
- <include layout="@layout/compact_account_info" />
- <include layout="@layout/editor_account_selector" />
+ <include layout="@layout/editor_account_header" />
<include layout="@layout/compact_contact_editor_fields"/>
diff --git a/res/layout/compact_account_info.xml b/res/layout/compact_account_info.xml
deleted file mode 100644
index dda4fe4..0000000
--- a/res/layout/compact_account_info.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 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.
--->
-
-<!-- Copy of editor_account_header_expandable, but w/o the expand account button. -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_container"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:minHeight="@dimen/editor_min_line_item_height"
- android:orientation="horizontal"
- android:background="?android:attr/selectableItemBackground"
- android:layout_marginBottom="@dimen/compact_editor_name_top_margin"
- android:visibility="gone"
- >
-
-
- <ImageView
- android:id="@+id/account_type_icon"
- style="@style/EditSelectorIconStyle"/>
-
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_marginTop="@dimen/compact_editor_account_header_top_margin"
- android:layout_marginStart="@dimen/compact_editor_account_left_margin"
- android:layout_gravity="center_vertical"
- android:orientation="vertical"
- >
-
- <TextView
- android:id="@+id/account_type"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:singleLine="true"
- android:textColor="@color/primary_text_color"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- />
-
- <TextView
- android:id="@+id/account_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- android:singleLine="true"
- android:textColor="@color/secondary_text_color"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- />
-
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index 1e134e0..e00c648 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -40,8 +40,7 @@
android:focusableInTouchMode="true"/>
<include layout="@layout/editor_all_rawcontacts_accounts_selector" />
- <include layout="@layout/compact_account_info" />
- <include layout="@layout/editor_account_selector" />
+ <include layout="@layout/editor_account_header" />
<include layout="@layout/compact_contact_editor_fields" />
diff --git a/res/layout/editor_account_header.xml b/res/layout/editor_account_header.xml
index 59ae3b1..5a93b58 100644
--- a/res/layout/editor_account_header.xml
+++ b/res/layout/editor_account_header.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!--
+ Copyright (C) 2015 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.
@@ -15,59 +16,64 @@
-->
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_container"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:minHeight="48dip"
- android:background="#EEEEEE"
- android:orientation="horizontal"
- android:paddingTop="8dip"
- android:paddingBottom="8dip"
- android:gravity="center_vertical"
- android:paddingLeft="@dimen/account_container_left_padding"
- android:paddingRight="28dip"
- android:paddingStart="@dimen/account_container_left_padding"
- android:paddingEnd="28dip">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/account_header_container"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:minHeight="@dimen/editor_min_line_item_height"
+ android:orientation="horizontal"
+ android:paddingBottom="@dimen/compact_editor_name_top_margin"
+ >
+
+
+ <ImageView
+ android:id="@+id/account_type_icon"
+ style="@style/EditSelectorIconStyle"/>
<LinearLayout
- android:id="@+id/account"
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:orientation="vertical"
- android:background="?android:attr/selectableItemBackground">
-
- <TextView
- android:id="@+id/account_type"
- android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true"
- android:textColor="@color/primary_text_color"
- android:ellipsize="end" />
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_marginTop="@dimen/compact_editor_account_header_top_margin"
+ android:layout_marginStart="@dimen/compact_editor_account_left_margin"
+ android:layout_gravity="center_vertical"
+ android:orientation="vertical"
+ >
<TextView
- android:id="@+id/account_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/primary_text_color"
- android:singleLine="true"
- android:ellipsize="end" />
+ android:id="@+id/account_type"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:singleLine="true"
+ android:textColor="@color/primary_text_color"
+ android:ellipsize="end"
+ android:textAlignment="viewStart"
+ />
+
+ <TextView
+ android:id="@+id/account_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:singleLine="true"
+ android:textColor="@color/secondary_text_color"
+ android:ellipsize="end"
+ android:textAlignment="viewStart"
+ />
</LinearLayout>
- <FrameLayout
+ <ImageView
+ android:id="@+id/account_expander_icon"
+ android:src="@drawable/ic_menu_expander_minimized_holo_light"
android:layout_width="wrap_content"
- android:layout_height="match_parent">
-
- <ImageView
- android:id="@+id/account_icon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_gravity="center_vertical" />
-
- </FrameLayout>
-
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|end"
+ android:layout_alignParentEnd="true"
+ android:paddingStart="@dimen/editor_round_button_padding_left"
+ android:paddingEnd="@dimen/editor_round_button_padding_right"
+ android:paddingTop="@dimen/editor_round_button_padding_top"
+ android:paddingBottom="@dimen/editor_round_button_padding_bottom"
+ android:visibility="gone"/>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/editor_account_header_expandable.xml b/res/layout/editor_account_header_expandable.xml
deleted file mode 100644
index c3d9e31..0000000
--- a/res/layout/editor_account_header_expandable.xml
+++ /dev/null
@@ -1,86 +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.
--->
-
-<!-- Header at the top of a raw contact editor. This is clickable to expand/collapse the editor. -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_header_container"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:paddingStart="16dp"
- android:focusable="true"
- >
-
- <!-- TODO: consider making this a new style, like EditKindIconStyle -->
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/editor_kind_icon_size"
- android:layout_height="@dimen/editor_kind_icon_size"
- android:layout_marginEnd="28dp"
- android:layout_gravity="center_vertical"
- />
-
- <LinearLayout
- android:id="@+id/account_info"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_weight="1"
- android:paddingBottom="@dimen/editor_account_header_expandable_top_bottom_padding"
- android:paddingTop="@dimen/editor_account_header_expandable_top_bottom_padding"
- android:orientation="vertical"
- >
-
- <TextView
- android:id="@+id/account_type"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:singleLine="true"
- android:textColor="@color/primary_text_color"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- />
-
- <TextView
- android:id="@+id/account_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- android:singleLine="true"
- android:textColor="@color/secondary_text_color"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- />
-
- </LinearLayout>
-
- <ImageView
- android:id="@+id/expand_account_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:layout_gravity="center_vertical|end"
- android:clickable="false"
- android:paddingLeft="@dimen/editor_round_button_padding_left"
- android:paddingRight="@dimen/editor_round_button_padding_right"
- android:paddingStart="@dimen/editor_round_button_padding_left"
- android:paddingEnd="@dimen/editor_round_button_padding_right"
- android:paddingTop="@dimen/editor_round_button_padding_top"
- android:paddingBottom="@dimen/editor_round_button_padding_bottom"
- />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/editor_account_selector.xml b/res/layout/editor_account_selector.xml
deleted file mode 100644
index dcd0e28..0000000
--- a/res/layout/editor_account_selector.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Header at the top of a raw contact editor. This allows users to change the account that
- the raw contact is saved in. -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_selector_container"
- android:focusable="true"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:minHeight="@dimen/editor_min_line_item_height"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/compact_editor_name_top_margin"
- android:visibility="gone">
-
- <ImageView
- android:id="@+id/kind_icon"
- android:src="@drawable/ic_account_circle_black_24dp"
- android:tint="@color/editor_icon_color"
- android:contentDescription="@string/header_account_entry"
- style="@style/EditSelectorIconStyle"/>
-
- <LinearLayout
- android:id="@+id/account"
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
- android:orientation="vertical"
- android:layout_marginStart="4dp"
- android:layout_marginEnd="48dp">
-
- <TextView
- android:id="@+id/account_type_selector"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:singleLine="true"
- android:textColor="@color/primary_text_color"
- android:textAlignment="viewStart"
- android:ellipsize="end" />
-
- <TextView
- android:id="@+id/account_name_selector"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- android:singleLine="true"
- android:textColor="@color/secondary_text_color"
- android:textAlignment="viewStart"
- android:ellipsize="end" />
-
- </LinearLayout>
-
- <ImageView
- android:src="@drawable/ic_menu_expander_minimized_holo_light"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|end"
- android:layout_alignParentEnd="true"
- android:paddingStart="@dimen/editor_round_button_padding_left"
- android:paddingEnd="@dimen/editor_round_button_padding_right"
- android:paddingTop="@dimen/editor_round_button_padding_top"
- android:paddingBottom="@dimen/editor_round_button_padding_bottom"/>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/raw_contact_readonly_editor_view.xml b/res/layout/raw_contact_readonly_editor_view.xml
index 25699ce..e50aa98 100644
--- a/res/layout/raw_contact_readonly_editor_view.xml
+++ b/res/layout/raw_contact_readonly_editor_view.xml
@@ -21,7 +21,7 @@
android:orientation="vertical" >
<include
- layout="@layout/editor_account_header_expandable" />
+ layout="@layout/editor_account_header" />
<LinearLayout
android:id="@+id/collapsable_section"
diff --git a/src/com/android/contacts/editor/BaseRawContactEditorView.java b/src/com/android/contacts/editor/BaseRawContactEditorView.java
index e99af61..fc1e8a1 100644
--- a/src/com/android/contacts/editor/BaseRawContactEditorView.java
+++ b/src/com/android/contacts/editor/BaseRawContactEditorView.java
@@ -80,7 +80,7 @@
mPhoto.setEnabled(isEnabled());
mAccountHeaderContainer = findViewById(R.id.account_header_container);
- mExpandAccountButton = (ImageView) findViewById(R.id.expand_account_button);
+ mExpandAccountButton = (ImageView) findViewById(R.id.account_expander_icon);
mCollapsibleSection = (LinearLayout) findViewById(R.id.collapsable_section);
mAccountName = (TextView) findViewById(R.id.account_name);
mAccountType = (TextView) findViewById(R.id.account_type);
diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index d023d35..b2bdd6d 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -338,12 +338,7 @@
private TextView mAccountHeaderType;
private TextView mAccountHeaderName;
private ImageView mAccountHeaderIcon;
-
- // Account selector
- private View mAccountSelectorContainer;
- private View mAccountSelector;
- private TextView mAccountSelectorType;
- private TextView mAccountSelectorName;
+ private ImageView mAccountHeaderExpanderIcon;
// Raw contacts selector
private View mRawContactContainer;
@@ -385,16 +380,11 @@
getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
// Account header
- mAccountHeaderContainer = findViewById(R.id.account_container);
+ mAccountHeaderContainer = findViewById(R.id.account_header_container);
mAccountHeaderType = (TextView) findViewById(R.id.account_type);
mAccountHeaderName = (TextView) findViewById(R.id.account_name);
mAccountHeaderIcon = (ImageView) findViewById(R.id.account_type_icon);
-
- // Account selector
- mAccountSelectorContainer = findViewById(R.id.account_selector_container);
- mAccountSelector = findViewById(R.id.account);
- mAccountSelectorType = (TextView) findViewById(R.id.account_type_selector);
- mAccountSelectorName = (TextView) findViewById(R.id.account_name_selector);
+ mAccountHeaderExpanderIcon = (ImageView) findViewById(R.id.account_expander_icon);
// Raw contacts selector
mRawContactContainer = findViewById(R.id.all_rawcontacts_accounts_container);
@@ -796,7 +786,6 @@
// TODO: we have mRawContactDeltas, we don't need to pass the RawContactDeltaList to this method
private void addAccountInfo(RawContactDeltaList rawContactDeltas) {
mAccountHeaderContainer.setVisibility(View.GONE);
- mAccountSelectorContainer.setVisibility(View.GONE);
mRawContactContainer.setVisibility(View.GONE);
if (mPrimaryNameKindSectionData == null) return;
@@ -908,24 +897,11 @@
private void addAccountSelector(Pair<String,String> accountInfo,
final RawContactDelta rawContactDelta) {
- mAccountSelectorContainer.setVisibility(View.VISIBLE);
-
- if (TextUtils.isEmpty(accountInfo.first)) {
- // Hide this view so the other text view will be centered vertically
- mAccountSelectorName.setVisibility(View.GONE);
- } else {
- mAccountSelectorName.setVisibility(View.VISIBLE);
- mAccountSelectorName.setText(accountInfo.first);
- }
-
- final String selectorTitle = getResources().getString(
- R.string.compact_editor_account_selector_title);
- mAccountSelectorType.setText(selectorTitle);
-
- mAccountSelectorContainer.setContentDescription(getResources().getString(
- R.string.compact_editor_account_selector_description, accountInfo.first));
-
- mAccountSelectorContainer.setOnClickListener(new View.OnClickListener() {
+ // Show save to default account.
+ addAccountHeader(accountInfo);
+ // Add handlers for choosing another account to save to.
+ mAccountHeaderExpanderIcon.setVisibility(View.VISIBLE);
+ mAccountHeaderContainer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final ListPopupWindow popup = new ListPopupWindow(getContext(), null);
@@ -933,8 +909,8 @@
new AccountsListAdapter(getContext(),
AccountsListAdapter.AccountListFilter.ACCOUNTS_CONTACT_WRITABLE,
mPrimaryAccount);
- popup.setWidth(mAccountSelectorContainer.getWidth());
- popup.setAnchorView(mAccountSelectorContainer);
+ popup.setWidth(mAccountHeaderContainer.getWidth());
+ popup.setAnchorView(mAccountHeaderContainer);
popup.setAdapter(adapter);
popup.setModal(true);
popup.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
diff --git a/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java b/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
index 6e4c055..ad8504c 100644
--- a/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
+++ b/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
@@ -92,7 +92,7 @@
mAccountHeaderTypeTextView = (TextView) findViewById(R.id.account_type);
mAccountHeaderNameTextView = (TextView) findViewById(R.id.account_name);
- mAccountIconImageView = (ImageView) findViewById(android.R.id.icon);
+ mAccountIconImageView = (ImageView) findViewById(R.id.account_type_icon);
}
/**