Permalink
Browse files

Landscape while in call.

Patch2 : Fix layouts.
Patch3 : Minor tweak in orientation shift methods.

Change-Id: I503fa8b3da9d02439385d52527b3da7a8d5658bb
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
  • Loading branch information...
1 parent c674ba2 commit 91fb17a72b0e9d8b83fe6c73bf007a87ed96e928 @Zaphod-Beeblebrox Zaphod-Beeblebrox committed with Zaphod-Beeblebrox Jan 28, 2012
View
2 AndroidManifest.xml 100644 → 100755
@@ -248,7 +248,7 @@
android:label="@string/phoneIconLabel"
android:excludeFromRecents="true"
android:launchMode="singleInstance"
- android:screenOrientation="portrait"
+ android:screenOrientation="sensor"
android:configChanges="orientation|screenSize|keyboardHidden|uiMode"
android:exported="false">
</activity>
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/top"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:layout_marginLeft="@dimen/dialpad_horizontal_margin"
- android:layout_marginRight="@dimen/dialpad_horizontal_margin">
-
- <!-- Text field above the keypad where the digits are displayed -->
- <LinearLayout
- android:id="@+id/digits_container"
- android:layout_width="match_parent"
- android:layout_height="@dimen/emergency_dialer_digits_height"
- android:layout_marginTop="@dimen/dialpad_vertical_margin"
- android:layout_marginBottom="69dip"
- android:gravity="center"
- android:background="@drawable/dialpad_background" >
-
- <EditText
- android:id="@+id/digits"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:gravity="center"
- android:scrollHorizontally="true"
- android:textAppearance="@style/DialtactsDigitsTextAppearance"
- android:nextFocusRight="@+id/deleteButton"
- android:background="@android:color/transparent"
- android:hint="@string/dialerKeyboardHintText" />
-
- <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>
-
- <FrameLayout
- android:id="@+id/dialButtonContainer"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_gravity="center_horizontal"
- android:background="@drawable/dialpad_background">
-
- <ImageButton
- android:id="@+id/dialButton"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:state_enabled="false"
- android:background="@drawable/btn_call"
- android:contentDescription="@string/description_dial_button"
- android:src="@drawable/ic_dial_action_call" />
-
- </FrameLayout>
-
-</LinearLayout>
@@ -0,0 +1,70 @@
+<?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="wrap_content"
+ android:layout_height="match_parent"
+ android:background="@drawable/dialpad_background_opaque">
+ <!-- The buttons here have a text label floating off to the side
+ (which is necessary because these buttons are used only in
+ a few rare states, and the meaning of the icon might not be
+ obvious.) The entire row (button + text) is clickable. -->
+
+ <!-- "Manage conference" -->
+ <!-- This button is used only on GSM devices, during a conference call. -->
+ <LinearLayout android:id="@+id/manageConferenceButton"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/button_cluster_side_padding"
+ android:paddingRight="@dimen/button_cluster_side_padding"
+ android:background="?android:attr/selectableItemBackground">
+ <!-- The entire LinearLayout here is clickable, so we don't
+ care about clicks on the ImageButton itself. -->
+ <ImageButton android:id="@+id/manageConferenceButtonImage"
+ android:clickable="false"
+ style="@style/InCallExtraRowButtonLand"
+ android:src="@drawable/ic_groups_holo_dark"
+ android:contentDescription="@string/onscreenManageConferenceText" />
+ <TextView android:id="@+id/manageConferenceButtonLabel"
+ style="@style/InCallExtraRowButtonLabel"
+ android:text="@string/onscreenManageConferenceText" />
+ </LinearLayout>
+
+ <!-- CDMA-specific "Merge" -->
+ <!-- This button is used only on CDMA devices, where we can't use
+ the Merge button in the main button row (because the "Add Call"
+ button might need to be enabled at the same time.) -->
+ <LinearLayout android:id="@+id/cdmaMergeButton"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/button_cluster_side_padding"
+ android:paddingRight="@dimen/button_cluster_side_padding"
+ android:background="?android:attr/selectableItemBackground">
+ <!-- The entire LinearLayout here is clickable, so we don't
+ care about clicks on the ImageButton itself. -->
+ <ImageButton android:id="@+id/cdmaMergeButtonImage"
+ android:clickable="false"
+ style="@style/InCallExtraRowButtonLand"
+ android:src="@drawable/ic_merge_holo_dark"
+ android:contentDescription="@string/onscreenMergeCallsText" />
+ <TextView android:id="@+id/cdmaMergeButtonLabel"
+ style="@style/InCallExtraRowButtonLabel"
+ android:text="@string/onscreenMergeCallsText" />
+ </LinearLayout>
+
+</FrameLayout>
Oops, something went wrong.

0 comments on commit 91fb17a

Please sign in to comment.