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

Commit b69a62b5 authored by Maurice Chu's avatar Maurice Chu Committed by Android (Google) Code Review
Browse files

Merge "Stack header account information in Groups tab" into jb-dev

parents 3607687e 6662193b
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
-->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <!-- Only visible when it is the first element in the list. -->
    <View
        android:id="@+id/header_extra_top_padding"
        android:layout_width="match_parent"
        android:layout_height="@dimen/list_header_extra_top_padding" />

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

</LinearLayout>
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
-->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <!-- Only visible when it is the first element in the list. -->
    <View
        android:id="@+id/header_extra_top_padding"
        android:layout_width="match_parent"
        android:layout_height="@dimen/list_header_extra_top_padding" />

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

</LinearLayout>
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
-->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <!-- Only visible when it is the first element in the list. -->
    <View
        android:id="@+id/header_extra_top_padding"
        android:layout_width="match_parent"
        android:layout_height="@dimen/list_header_extra_top_padding" />

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

</LinearLayout>
+51 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
-->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:minHeight="?attr/list_item_header_height"
    android:layout_marginLeft="?attr/list_item_padding_left"
    android:layout_marginRight="?attr/list_item_padding_right"
    android:background="@drawable/list_section_divider_holo_custom"
    android:orientation="horizontal">

    <TextView
        android:id="@+id/account_type"
        android:layout_width="0px"
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:layout_gravity="center_vertical"
        android:paddingLeft="?attr/list_item_header_text_indent"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="@color/people_app_theme_color"
        android:textStyle="bold"
        android:textAllCaps="true"
        android:singleLine="true"/>

    <!-- TODO: Should use correct color with a correct name (content should be same).
         can use "?android:attr/textColorTertiary" -->
    <TextView
        android:id="@+id/account_name"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"
        android:textColor="@color/contact_count_text_color"
        android:textSize="12sp"
        android:singleLine="true"
        android:ellipsize="middle" />
</LinearLayout>
+52 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
-->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:minHeight="?attr/list_item_header_height"
    android:layout_marginLeft="?attr/list_item_padding_left"
    android:layout_marginRight="?attr/list_item_padding_right"
    android:paddingBottom="4dip"
    android:background="@drawable/list_section_divider_holo_custom"
    android:orientation="vertical">

    <TextView
        android:id="@+id/account_type"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"
        android:paddingLeft="?attr/list_item_header_text_indent"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="@color/people_app_theme_color"
        android:textStyle="bold"
        android:textAllCaps="true"
        android:singleLine="true"/>

    <!-- TODO: Should use correct color with a correct name (content should be same).
         can use "?android:attr/textColorTertiary" -->
    <TextView
        android:id="@+id/account_name"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"
        android:paddingLeft="?attr/list_item_header_text_indent"
        android:textColor="@color/contact_count_text_color"
        android:textSize="12sp"
        android:singleLine="true"
        android:ellipsize="middle" />
</LinearLayout>
Loading