Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 (ff95f657) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/DigitalClock.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,8 @@ public class DigitalClock extends RelativeLayout {
		private String mAmString, mPmString;

		AmPm(View parent, Typeface tf) {
		mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm);
		// No longer used, uncomment if we decide to use AM/PM indicator again
		// mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm);
		if (mAmPmTextView != null && tf != null) {
		mAmPmTextView.setTypeface(tf);
		}

core/res/res/drawable-hdpi/transportcontrol_bg.9.png

0 → 100644

+4.11 KiB

Loading image diff...

core/res/res/drawable-mdpi/transportcontrol_bg.9.png

0 → 100644

+2.4 KiB

Loading image diff...

core/res/res/drawable-xhdpi/transportcontrol_bg.9.png

0 → 100644

+6.5 KiB

Loading image diff...

core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml

+67 −46

Original line number	Diff line number	Diff line
		@@ -17,45 +17,69 @@
		*/
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		android:layout_height="match_parent">

		<View
		android:layout_width="match_parent"
		android:layout_height="0dip"
		<!-- left side: status and music -->
		<RelativeLayout
		android:layout_height="match_parent"
		android:layout_weight="1"
		/>
		android:layout_width="0dip"
		android:gravity="center">

		<RelativeLayout
		<RelativeLayout android:id="@+id/transport_bg_protect"
		android:layout_width="512dip"
		android:layout_height="wrap_content"
		android:layout_marginBottom="24dip">

		<!-- Music transport control underneath -->
		<include android:id="@+id/transport"
		layout="@layout/keyguard_transport_control"
		android:layout_row="0"
		android:layout_column="0"
		android:layout_rowSpan="3"
		android:layout_columnSpan="1"
		android:layout_gravity="fill"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		android:layout_height="512dip"
		/>

		<!-- left side: status -->
		<!-- Status -->
		<include layout="@layout/keyguard_screen_status_land"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="102dip"
		android:paddingTop="50dip"
		android:layout_centerVertical="true"
		android:layout_marginLeft="50dip"
		android:layout_marginTop="50dip"
		android:layout_marginBottom="50dip"
		android:layout_marginRight="64dip"
		android:layout_alignParentTop="true"
		android:layout_alignParentLeft="true"/>

		</RelativeLayout>

		</RelativeLayout>

		<!-- right side: password -->
		<LinearLayout
		android:layout_width="330dip"
		android:layout_height="wrap_content"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:layout_alignParentRight="true"
		android:layout_centerVertical="true"
		android:layout_marginRight="155dip">
		android:gravity="center">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="330dip"
		android:layout_height="wrap_content">

		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_gravity="center"
		android:background="@drawable/lockscreen_password_field_dark">

		<EditText android:id="@+id/passwordEntry"
		@@ -88,6 +112,7 @@
		android:visibility="gone"
		/>

		<!-- The IME switcher button is only shown in ASCII password mode (not PIN) -->
		<ImageView android:id="@+id/switch_ime_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -103,28 +128,20 @@

		<!-- Numeric keyboard -->
		<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
		android:layout_width="330dip"
		android:layout_width="match_parent"
		android:layout_height="330dip"
		android:background="#40000000"
		android:layout_marginTop="5dip"
		android:keyBackground="@drawable/btn_keyboard_key_ics"
		android:visibility="gone"
		/>
		</LinearLayout>

		</RelativeLayout>

		<View
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"
		/>

		<!-- emergency call button NOT CURRENTLY USED -->
		<!-- Emergency call button. Generally not used on tablet devices. -->
		<Button
		android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:drawableLeft="@drawable/ic_emergency"
		android:drawablePadding="8dip"
		android:text="@string/lockscreen_emergency_call"
		@@ -133,3 +150,7 @@
		/>

		</LinearLayout>

		</LinearLayout>

		</LinearLayout>