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

Commit 7f8d6a5e authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Introduce ActionBar in picker screens"

parents 04ffa93c a8729cdf

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ 
            android:theme="@style/ContactPickerTheme"

            android:launchMode="singleTop"

            android:clearTaskOnLaunch="true"

        >

            android:uiOptions="splitActionBarWhenNarrow">

            <intent-filter>

                <action android:name="android.intent.action.INSERT_OR_EDIT" />

                <category android:name="android.intent.category.DEFAULT" />

res/layout-sw580dp/contact_picker.xml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?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.

-->



<view

    xmlns:android="http://schemas.android.com/apk/res/android"

    class="com.android.contacts.widget.FullHeightLinearLayout"

    style="@style/ContactPickerLayout"

    android:orientation="vertical"

    android:layout_height="match_parent">

    <view

        class="android.widget.SearchView"

        android:id="@+id/search_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="0dip"

        android:layout_marginRight="32dip"

        android:iconifiedByDefault="false" />

    <!-- will contain an appropriate contacts list -->

    <FrameLayout

        android:id="@+id/list_container"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1" />



    <LinearLayout

        style="?android:attr/buttonBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="16dip"

        android:paddingRight="16dip">

        <Button

            android:id="@+id/new_contact"

            style="?android:attr/buttonBarButtonStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAllCaps="true"

            android:text="@string/pickerNewContactText" />

    </LinearLayout>

</view>

res/layout/contact_picker.xml

+0 −22
Original line number Diff line number Diff line
@@ -34,26 +34,4 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1" />



    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:background="?android:attr/dividerHorizontal" />



    <LinearLayout

        style="?android:attr/buttonBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="16dip"

        android:paddingRight="16dip">

        <Button

            style="?android:attr/buttonBarButtonStyle"

            android:id="@+id/cancel"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@android:string/cancel" />

    </LinearLayout>

</view>

res/layout/join_contact_picker.xml

+0 −14
Original line number Diff line number Diff line
@@ -33,18 +33,4 @@ 
        android:layout_marginLeft="?attr/contact_browser_list_padding_left"

        android:layout_marginRight="?attr/contact_browser_list_padding_right"

        android:background="?android:attr/dividerHorizontal" />



    <LinearLayout

        style="?android:attr/buttonBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="?attr/contact_browser_list_padding_left"

        android:layout_marginRight="?attr/contact_browser_list_padding_right">

        <Button

            style="?android:attr/buttonBarButtonStyle"

            android:id="@+id/cancel"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@android:string/cancel"/>

    </LinearLayout>

</view>

res/layout/join_contact_picker_list_content.xml

+5 −4
Original line number Diff line number Diff line
@@ -19,17 +19,18 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dip"

    android:paddingTop="16dip"

    android:orientation="vertical">



    <TextView

        android:id="@+id/join_contact_blurb"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"

        android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"

        android:paddingLeft="?attr/list_item_header_text_indent"

        android:maxLines="2"

        android:textAppearance="?android:attr/textAppearanceMedium" />

        android:textAppearance="?android:attr/textAppearanceSmall" />



    <FrameLayout

        android:id="@+id/pinned_header_list_layout"