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

Commit a9d7d2ec authored by Maurice Chu's avatar Maurice Chu Committed by Android Git Automerger
Browse files

am 370e5406: am 7c086606: Merge "Change to quickcontact landscape style on 7"" into jb-dev 

* commit '370e5406':
  Change to quickcontact landscape style on 7"
parents 8ccdd58c 370e5406

res/layout-sw580dp-w940dp/quickcontact_activity.xml

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

<!-- Copyright (C) 2012 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.quickcontact.FloatingChildLayout"

    android:id="@+id/floating_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:descendantFocusability="afterDescendants">

    <LinearLayout

        android:id="@android:id/content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="32dip"

        android:orientation="horizontal">

        <FrameLayout

            android:layout_width="360dip"

            android:layout_height="360dip">

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

        </FrameLayout>

        <LinearLayout

            android:layout_width="360dip"

            android:layout_height="match_parent"

            android:orientation="vertical">

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

            <View

                android:id="@+id/line_after_track"

                android:layout_width="match_parent"

                android:layout_height="2dip"

                android:background="@color/quickcontact_tab_indicator" />

            <android.support.v4.view.ViewPager

                android:id="@+id/item_list_pager"

                android:background="@color/quickcontact_list_background"

                android:layout_width="match_parent"

                android:layout_height="match_parent" />

        </LinearLayout>

    </LinearLayout>

</view>

res/layout-sw680dp-w1000dp/quickcontact_activity.xml

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

<!-- Copyright (C) 2012 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.quickcontact.FloatingChildLayout"

    android:id="@+id/floating_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:descendantFocusability="afterDescendants">

    <LinearLayout

        android:id="@android:id/content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="32dip"

        android:orientation="horizontal">

        <FrameLayout

            android:layout_width="360dip"

            android:layout_height="360dip">

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

        </FrameLayout>

        <LinearLayout

            android:layout_width="360dip"

            android:layout_height="match_parent"

            android:orientation="vertical">

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

            <View

                android:id="@+id/line_after_track"

                android:layout_width="match_parent"

                android:layout_height="2dip"

                android:background="@color/quickcontact_tab_indicator" />

            <android.support.v4.view.ViewPager

                android:id="@+id/item_list_pager"

                android:background="@color/quickcontact_list_background"

                android:layout_width="match_parent"

                android:layout_height="match_parent" />

        </LinearLayout>

    </LinearLayout>

</view>

res/layout-sw680dp/quickcontact_activity.xml

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

<!-- Copyright (C) 2012 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"

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

    class="com.android.contacts.quickcontact.FloatingChildLayout"

    android:id="@+id/floating_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:descendantFocusability="afterDescendants">

    <LinearLayout

        android:id="@android:id/content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="32dip"

        android:orientation="vertical" >

        <FrameLayout

            android:layout_width="360dip"

            android:layout_height="@dimen/quick_contact_photo_container_height">

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

        </FrameLayout>

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

        <View

            android:id="@+id/line_after_track"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:background="@color/quickcontact_tab_indicator" />

        <android.support.v4.view.ViewPager

            android:id="@+id/item_list_pager"

            android:layout_width="match_parent"

            android:layout_height="160dip" />

    </LinearLayout>

</view>