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

Commit 207d4f68 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fit-and-finish. Redoing the title for contact search results. 

Bug: 2534618

Change-Id: If00dd28dfcdc5596e6b6cb8a5690f5c0382200de
parent 5c5d71a2

AndroidManifest.xml

+15 −8
Original line number Diff line number Diff line
@@ -224,14 +224,6 @@ 
                <data android:mimeType="vnd.android.cursor.item/postal-address" android:host="contacts" />

            </intent-filter>



            <intent-filter>

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

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

            </intent-filter>



            <meta-data android:name="android.app.searchable"

                android:resource="@xml/searchable"

            />

        </activity>



        <!-- An activity for joining contacts -->
@@ -257,6 +249,21 @@ 
            </intent-filter>

        </activity>



        <!-- The contacts search/filter UI -->

        <activity android:name="SearchResultsActivity"

            android:theme="@style/TallTitleBarTheme"

            android:label="@string/contactsList"

        >

            <intent-filter>

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

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

            </intent-filter>



            <meta-data android:name="android.app.searchable"

                android:resource="@xml/searchable"

            />

        </activity>



        <!-- Used to select display and sync groups -->

        <activity android:name=".ui.ContactsPreferencesActivity" android:label="@string/displayGroups" />

res/layout-finger/contacts_list_search_results.xml

0 → 100644
+65 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 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:id="@+id/pinned_header_list_layout"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        >



    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:background="@*android:drawable/title_bar_medium"

            android:paddingLeft="10dip"

            android:paddingRight="10dip"

            android:gravity="center_vertical"

            >



        <TextView

            android:id="@+id/search_results_for"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/titleJoinContactDataWith"

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

            android:shadowColor="#BB000000"

            android:shadowRadius="2.75"

        />



        <TextView

            android:id="@+id/search_results_found"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-2dip"

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

        />



    </LinearLayout>



    <view

        class="com.android.contacts.PinnedHeaderListView"

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fastScrollEnabled="true"

    />



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



</LinearLayout>

res/layout-ja-finger/edit_phonetic_name.xml

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2009 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.

-->



<!-- "Phonetic name" field on the Edit contact screen, for

     Japanese-language locales (i.e. the "furigana" or "yomi" field.) -->

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

    android:layout_width="match_parent"

    android:layout_height="?android:attr/listPreferredItemHeight"

    android:orientation="horizontal"

    android:padding="0dip"

    android:gravity="center_vertical"

    android:baselineAligned="false"

    >

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingLeft="4dip"

        android:gravity="left|center_vertical"

        android:text="@string/label_phonetic_name"

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

        />

    <EditText android:id="@+id/phonetic_name"

        android:layout_width="0dip"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_marginLeft="8dip"

        android:layout_marginRight="4dip"

        android:gravity="center_vertical"

        android:inputType="textPersonName|textCapWords"

        android:hint="@string/ghostData_phonetic_name"

        android:nextFocusDown="@id/data"

        />

</LinearLayout>

res/values-en-rGB/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,5 +30,5 @@ 
    <string name="display_options_view_given_name_first">First name first</string>



    <!-- An allowable value for the "view names as" contact display option  -->

    <string name="display_options_view_family_name_first">Surname name first</string>

    <string name="display_options_view_family_name_first">Surname first</string>

</resources>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1128,4 +1128,10 @@ 
    

    <!-- Button shown in the contacts app if the background process updating contacts fails because of memory shortage -->

    <string name="upgrade_out_of_memory_retry">Retry upgrade</string>



    <!-- Title shown in the search result activity of contacts app -->

    <string name="search_results_for">Search results for: <xliff:g id="query">%s</xliff:g></string>



    <!-- Title shown in the search result activity of contacts app while searching -->

    <string name="search_results_searching">Searching...</string>

</resources>