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

Commit 1827f38d authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents ce8278bf f8132fc1

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 


        <!-- The main Contacts activity with the contact list, favorites, and groups. -->

        <activity android:name=".activities.PeopleActivity"

            android:label="@string/people"

            android:label="@string/app_name"

            android:theme="@style/PeopleTheme"

            android:screenOrientation="nosensor"

            android:uiOptions="splitActionBarWhenNarrow"

res/layout/group_manage.xml

+3 −9
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
<!--

 *

 * Copyright (c) 2013, The Linux Foundation. All Rights Reserved.

 * Copyright (c) 2014, The CyanogenMod Project

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -28,13 +29,7 @@ 
 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 -->

<TabHost

        android:id="@android:id/tabhost"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

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



    <LinearLayout

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

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">
@@ -59,4 +54,3 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content" />

</LinearLayout>
 
</TabHost>

res/layout/member_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
     android:layout_height="wrap_content"

     android:gravity="center_vertical"

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

     android:background="?android:activatedBackgroundIndicator"

     android:paddingTop="3dip"

     android:paddingBottom="3dip"

     >

res/menu/people_options.xml

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 


    <item

        android:id="@+id/menu_memory_status"

        android:visible="false"

        android:title="@string/menu_memory_status" />



    <item

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ 
<resources>

    <!-- CMCC feature -->

    <bool name="config_show_quick_call_button" translatable="false">false</bool>



    <string name="app_name">@string/people</string>

</resources>
 
 No newline at end of file