Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca1eaad2 authored by Walter Jang's avatar Walter Jang Committed by Android Git Automerger
Browse files

am 3d454d28: am 2d3f31c2: Show account info for inserts and read-only contact edits 

* commit '3d454d28':
  Show account info for inserts and read-only contact edits
parents b5938d77 3d454d28

res/layout-land/compact_contact_editor_fragment.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,8 @@ 
                android:layout_height="match_parent"

                android:layout_height="match_parent"

                android:orientation="vertical">

                android:orientation="vertical">





            <include layout="@layout/compact_account_info" />



            <include layout="@layout/compact_contact_editor_fields"/>

            <include layout="@layout/compact_contact_editor_fields"/>





        </LinearLayout>

        </LinearLayout>

res/layout/compact_account_info.xml

0 → 100644
+59 −0
Original line number Original line Diff line number Diff line 
<?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:background="?android:attr/selectableItemBackground"

        android:paddingStart="16dp"

        >



    <LinearLayout

            android:layout_height="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:paddingBottom="24dp"

            android:paddingTop="24dp"

            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"

                />



        <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"

                />



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/layout/compact_contact_editor_fragment.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@ 




        <include layout="@layout/compact_photo_editor_view" />

        <include layout="@layout/compact_photo_editor_view" />





        <include layout="@layout/compact_account_info" />



        <!-- Dummy view so the first input field is not initially focused. b/21644158 -->

        <!-- Dummy view so the first input field is not initially focused. b/21644158 -->

        <View

        <View

                android:layout_width="0dp"

                android:layout_width="0dp"

src/com/android/contacts/editor/BaseRawContactEditorView.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -197,12 +197,8 @@ public abstract class BaseRawContactEditorView extends LinearLayout { 




    protected void updateAccountHeaderContentDescription() {

    protected void updateAccountHeaderContentDescription() {

        final StringBuilder builder = new StringBuilder();

        final StringBuilder builder = new StringBuilder();

        if (!TextUtils.isEmpty(mAccountType.getText())) {

        builder.append(EditorUiUtils.getAccountInfoContentDescription(

            builder.append(mAccountType.getText()).append('\n');

                mAccountName.getText(), mAccountType.getText()));

        }

        if (!TextUtils.isEmpty(mAccountName.getText())) {

            builder.append(mAccountName.getText()).append('\n');

        }

        if (mExpandAccountButton.getVisibility() == View.VISIBLE) {

        if (mExpandAccountButton.getVisibility() == View.VISIBLE) {

            builder.append(getResources().getString(isCollapsed()

            builder.append(getResources().getString(isCollapsed()

                    ? R.string.content_description_expand_editor

                    ? R.string.content_description_expand_editor

src/com/android/contacts/editor/CompactContactEditorFragment.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment impl 
        final CompactRawContactsEditorView editorView = getContent();

        final CompactRawContactsEditorView editorView = getContent();

        editorView.setListener(this);

        editorView.setListener(this);

        editorView.setState(mState, getMaterialPalette(), mViewIdGenerator, mPhotoId, mNameId,

        editorView.setState(mState, getMaterialPalette(), mViewIdGenerator, mPhotoId, mNameId,

                mReadOnlyDisplayName);

                mReadOnlyDisplayName, mHasNewContact, mIsUserProfile);

        if (mReadOnlyDisplayName != null) {

        if (mReadOnlyDisplayName != null) {

            mReadOnlyNameEditorView = editorView.getDefaultNameEditorView();

            mReadOnlyNameEditorView = editorView.getDefaultNameEditorView();

        }

        }