Merge "Add landscape dialer for Contacts (Phone) app when in car dock." into jb-mr1-dev (5c55a91e) · Commits · e / os / android_packages_apps_Contacts

AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@
		android:launchMode="singleTask"
		android:clearTaskOnLaunch="true"
		android:icon="@mipmap/ic_launcher_phone"
		android:screenOrientation="portrait"
		android:screenOrientation="nosensor"
		android:enabled="@*android:bool/config_voice_capable"
		android:taskAffinity="android.task.contacts.phone"
		android:windowSoftInputMode="stateAlwaysHidden\|adjustNothing">
		@@ -464,7 +464,7 @@
		<activity android:name="CallDetailActivity"
		android:label="@string/callDetailTitle"
		android:theme="@style/CallDetailActivityTheme"
		android:screenOrientation="nosensor"
		android:screenOrientation="portrait"
		android:icon="@mipmap/ic_launcher_phone"
		android:taskAffinity="android.task.contacts.phone"
		>

res/layout-land/dialpad_fragment.xml

+73 −33

Original line number	Diff line number	Diff line
		@@ -17,33 +17,47 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/top"
		android:layout_width="match_parent"
		android:layout_height="match_parent" >

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:orientation="vertical"
		>
		android:layout_weight="3"
		android:orientation="vertical" >

		<!-- Text field above the keypad where the digits are displayed.
		It's type is set to PHONE (to put the keyboard in the right
		config) in the java code.
		-->
		<!-- TODO: Use a textAppearance to control the display of the number -->
		<EditText android:id="@+id/digits"
		<LinearLayout
		android:id="@+id/digits_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/dialpad_digits_height"
		android:layout_marginBottom="@dimen/dialpad_digits_margin_bottom"
		android:layout_marginTop="1dip"
		android:gravity="center"
		android:maxLines="1"
		android:scrollHorizontally="true"
		android:textSize="@dimen/dialpad_digits_text_size"
		android:freezesText="true"
		android:layout_height="0px"
		android:layout_weight="@integer/dialpad_layout_weight_digits"
		android:layout_marginTop="@dimen/dialpad_vertical_margin"
		android:background="@drawable/dialpad_background"
		android:textColor="@color/dialer_button_text"
		android:hint="@string/dialerKeyboardHintText"
		/>
		android:gravity="center">

		<com.android.contacts.dialpad.DigitsEditText
		android:id="@+id/digits"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:gravity="center"
		android:textAppearance="@style/DialtactsDigitsTextAppearance"
		android:textColor="?android:attr/textColorPrimary"
		android:nextFocusRight="@+id/overflow_menu"
		android:background="@android:color/transparent" />

		<!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
		<include layout="@layout/dialpad_additional_buttons" />
		<ImageButton
		android:id="@+id/deleteButton"
		android:layout_width="56dip"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:gravity="center"
		android:state_enabled="false"
		android:background="?android:attr/selectableItemBackground"
		android:contentDescription="@string/description_delete_button"
		android:src="@drawable/ic_dial_action_delete" />


		</LinearLayout>
		<!-- "Dialpad chooser" UI, shown only when the user brings up the
		Dialer while a call is already in progress.
		When this UI is visible, the other Dialer elements
		@@ -51,7 +65,33 @@
		<ListView android:id="@+id/dialpadChooser"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:footerDividersEnabled="true"
		/>
		android:footerDividersEnabled="true" />

		<!-- Keypad section -->
		<include layout="@layout/dialpad" />
		</LinearLayout>
		<View
		android:layout_width="@dimen/dialpad_center_margin"
		android:layout_height="match_parent"
		android:background="#66000000"/>
		<RelativeLayout
		android:id="@+id/dialButtonContainer"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="2"
		android:background="@drawable/dialpad_background">
		<View
		android:layout_width="match_parent"
		android:layout_height="@dimen/dialpad_button_margin"
		android:layout_above="@id/dialButton"
		android:background="#33000000" />
		<ImageButton android:id="@+id/dialButton"
		android:layout_width="match_parent"
		android:layout_height="@dimen/call_button_height"
		android:layout_alignParentBottom="true"
		android:state_enabled="false"
		android:background="@drawable/btn_call"
		android:contentDescription="@string/description_dial_button"
		android:src="@drawable/ic_dial_action_call" />
		</RelativeLayout>
		</LinearLayout>

res/layout-land/dialtacts_activity.xml

0 → 100644

+27 −0

Original line number	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.
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginTop="?android:attr/actionBarSize"
		android:id="@+id/dialtacts_frame"
		>
		<android.support.v4.view.ViewPager
		android:id="@+id/pager"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />
		</FrameLayout>

res/layout/call_log_fragment.xml

+1 −3

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@

		<!-- Layout parameters are set programmatically. -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		style="@style/FragmentActionBarPadding"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:paddingBottom="?android:attr/actionBarSize"
		android:divider="?android:attr/dividerHorizontal"
		android:showDividers="end">

		@@ -27,8 +27,6 @@
		android:id="@+id/voicemail_status"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentLeft="true"
		android:layout_alignParentBottom="true"
		android:visibility="gone">
		<include layout="@layout/call_log_voicemail_status"
		/>

res/layout/dialpad_additional_buttons.xml

deleted100644 → 0

+0 −75

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.
		-->

		<!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/dialpadAdditionalButtons"
		android:layout_width="match_parent"
		android:layout_height="0px"
		android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
		android:layout_gravity="center_horizontal"
		android:background="@drawable/dialpad_background"
		android:orientation="horizontal">

		<!-- Onscreen "All contacts" button.
		TODO: rename this id. -->
		<ImageButton android:id="@+id/searchButton"
		android:layout_width="0px"
		android:layout_weight="0.30"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:state_enabled="false"
		android:background="?android:attr/selectableItemBackground"
		android:contentDescription="@string/description_search_button"
		android:src="@drawable/ic_dial_action_search"/>

		<View
		android:layout_width="1dip"
		android:layout_height="24dip"
		android:layout_gravity="center_vertical"
		android:background="?android:attr/dividerVertical" />

		<!-- Onscreen "Dial" button, diused on all platforms by
		default. Its usage can be disabled using resources (see
		config.xml.) -->
		<ImageButton android:id="@+id/dialButton"
		android:layout_width="0px"
		android:layout_weight="0.40"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:state_enabled="false"
		android:background="@drawable/btn_call"
		android:contentDescription="@string/description_dial_button"
		android:src="@drawable/ic_dial_action_call" />

		<View
		android:layout_width="1dip"
		android:layout_height="24dip"
		android:layout_gravity="center_vertical"
		android:background="?android:attr/dividerVertical" />

		<!-- Onscreen "Backspace/Delete" button -->
		<ImageButton android:id="@+id/deleteButton"
		android:layout_width="0px"
		android:layout_weight="0.30"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:state_enabled="false"
		android:background="?android:attr/selectableItemBackground"
		android:contentDescription="@string/description_delete_button"
		android:src="@drawable/ic_dial_action_delete" />
		</LinearLayout>