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

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

Merge "Turn off DEBUG flag on Phone" into jb-dev

parents 18006ebc 8801e358

res/layout/call_log_fragment.xml

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingBottom="?android:attr/actionBarSize"

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

    android:divider="?android:attr/dividerHorizontal"

    android:showDividers="end">



    <FrameLayout

        android:id="@+id/voicemail_status"
@@ -34,8 +35,7 @@ 
    </FrameLayout>

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

    >

        android:layout_height="match_parent">

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

            android:layout_width="match_parent"

            android:layout_height="match_parent"

res/layout/phone_contact_tile_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingBottom="?android:attr/actionBarSize"

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

    android:divider="?android:attr/dividerHorizontal"

    android:showDividers="end">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

res/values/styles.xml

+1 −7
Original line number Diff line number Diff line
@@ -281,13 +281,7 @@ 
    </style>



    <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">

        <!-- For making test easier. Should use @null.

             TODO: use @null once we're sure issue 6041917 is gone.

             Don't forget to add android:showDividers="end" to call_log_fragment.xml

             and phone_contact_tile_list.xml, to show horizontal divider between

             the list and the split ActionBar.

          -->

        <!-- <item name="android:backgroundSplit">@null</item> -->

        <item name="android:backgroundSplit">@null</item>

        <item name="android:backgroundStacked">@drawable/ab_stacked_opaque_dark_holo</item>

        <item name="android:displayOptions"></item>

    </style>

src/com/android/contacts/activities/DialtactsActivity.java

+1 −4
Original line number Diff line number Diff line
@@ -82,10 +82,7 @@ public class DialtactsActivity extends TransactionSafeActivity 
        implements View.OnClickListener {

    private static final String TAG = "DialtactsActivity";



    /**

     * STOPSHIP: This must be turned off after issue 6127931 and 6041917 being resolved.

     */

    public static final boolean DEBUG = true;

    public static final boolean DEBUG = false;



    /** Used to open Call Setting */

    private static final String PHONE_PACKAGE = "com.android.phone";