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

Commit af7075c5 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

QuickContact for multi-window mode 

am: caf26197

* commit 'caf26197':
  QuickContact for multi-window mode

Change-Id: I1e344ebc1cf49de202cad2e2a57ebe982d5efeb1
parents c7fbefe6 caf26197

res/layout-land/quickcontact_activity.xml→res/layout-w500dp-land/quickcontact_activity.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project

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

res/layout/expanding_entry_card_item.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        android:layout_alignParentTop="true"

        android:paddingTop="5dp"

        android:layout_toEndOf="@+id/icon"

        android:layout_toStartOf="@+id/icon_alternate"

        android:layout_toStartOf="@+id/third_icon"

        android:textColor="@color/quickcontact_entry_header_text_color"

        android:textAlignment="viewStart"

        android:layout_marginBottom="@dimen/expanding_entry_card_header_margin_bottom" />
@@ -54,7 +54,7 @@ 
        android:layout_height="wrap_content"

        android:layout_below="@+id/header"

        android:layout_toEndOf="@+id/icon_sub_header"

        android:layout_toStartOf="@+id/icon_alternate"

        android:layout_toStartOf="@+id/third_icon"

        android:textAlignment="viewStart"

        android:textColor="@color/quickcontact_entry_sub_header_text_color" />
@@ -73,7 +73,7 @@ 
        android:id="@+id/text"

        android:layout_below="@+id/sub_header"

        android:layout_toEndOf="@+id/icon_text"

        android:layout_toStartOf="@+id/icon_alternate"

        android:layout_toStartOf="@+id/third_icon"

        android:textAlignment="viewStart"

        android:textColor="@color/quickcontact_entry_sub_header_text_color" />

res/values-land/bools.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<resources>



    <bool name="quickcontact_two_panel">true</bool>

    <bool name="quickcontact_two_panel">false</bool>

    <bool name="contacteditor_two_panel">true</bool>



</resources>

res/values-w500dp-land/bools.xml

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

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

-->

<resources>



    <bool name="quickcontact_two_panel">true</bool>



</resources>

res/values/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ 


    <bool name="quickcontact_two_panel">false</bool>

    <bool name="contact_all_list_show_card_frame">false</bool>

    <bool name="contacteditor_two_panel">false</bool>



</resources>