OSDN Git Service

Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
authorJim Miller <jaggies@google.com>
Fri, 20 May 2011 00:05:30 +0000 (17:05 -0700)
committerJim Miller <jaggies@google.com>
Fri, 20 May 2011 00:05:30 +0000 (17:05 -0700)
This fixes LockScreen on 7" tablets by moving the resources to xlarge.

In addition, it has some minor layout tweaks to center pattern and
wave unlock widgets on both so we can share the layout resources.

Change-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb

61 files changed:
core/res/res/drawable-mdpi/btn_code_lock_default.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/btn_code_lock_touched.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png
core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png
core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png
core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png
core/res/res/drawable-mdpi/ic_lock_idle_alarm.png
core/res/res/drawable-mdpi/ic_lock_idle_charging.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/ic_lock_idle_lock.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png
core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png
core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/sym_keyboard_delete_holo.png [moved from core/res/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png with 100% similarity]
core/res/res/drawable-mdpi/sym_keyboard_shift.png
core/res/res/drawable-mdpi/sym_keyboard_shift_locked.png [changed mode: 0755->0644]
core/res/res/drawable-mdpi/textfield_bg_activated_holo_dark.9.png [moved from core/res/res/drawable-xlarge-mdpi/textfield_bg_activated_holo_dark.9.png with 100% similarity]
core/res/res/drawable-mdpi/textfield_bg_default_holo_dark.9.png [moved from core/res/res/drawable-xlarge-mdpi/textfield_bg_default_holo_dark.9.png with 100% similarity]
core/res/res/drawable-mdpi/textfield_bg_disabled_focused_holo_dark.9.png [moved from core/res/res/drawable-xlarge-mdpi/textfield_bg_disabled_focused_holo_dark.9.png with 100% similarity]
core/res/res/drawable-mdpi/textfield_bg_disabled_holo_dark.9.png [moved from core/res/res/drawable-xlarge-mdpi/textfield_bg_disabled_holo_dark.9.png with 100% similarity]
core/res/res/drawable-mdpi/textfield_bg_focused_holo_dark.9.png [moved from core/res/res/drawable-xlarge-mdpi/textfield_bg_focused_holo_dark.9.png with 100% similarity]
core/res/res/drawable-mdpi/unlock_default.png [moved from core/res/res/drawable-xlarge-mdpi/unlock_default.png with 100% similarity]
core/res/res/drawable-mdpi/unlock_halo.png [moved from core/res/res/drawable-xlarge-mdpi/unlock_halo.png with 100% similarity]
core/res/res/drawable-mdpi/unlock_ring.png [moved from core/res/res/drawable-xlarge-mdpi/unlock_ring.png with 100% similarity]
core/res/res/drawable-mdpi/unlock_wave.png [moved from core/res/res/drawable-xlarge-mdpi/unlock_wave.png with 100% similarity]
core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal.9.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed.9.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png [deleted file]
core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png [deleted file]
core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png [deleted file]
core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png [deleted file]
core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png [deleted file]
core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png [deleted file]
core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png [deleted file]
core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png [deleted file]
core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png [deleted file]
core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png [deleted file]
core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png [deleted file]
core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png [deleted file]
core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked.png [deleted file]
core/res/res/layout-large/keyguard.xml [moved from core/res/res/layout-xlarge/keyguard.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_glogin_unlock.xml [moved from core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_lock.xml [moved from core/res/res/layout-xlarge/keyguard_screen_lock.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_password_landscape.xml [moved from core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_password_portrait.xml [moved from core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_sim_pin_landscape.xml [moved from core/res/res/layout-xlarge/keyguard_screen_sim_pin_landscape.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_sim_pin_portrait.xml [moved from core/res/res/layout-xlarge/keyguard_screen_sim_pin_portrait.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_status_land.xml [moved from core/res/res/layout-xlarge/keyguard_screen_status_land.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_status_port.xml [moved from core/res/res/layout-xlarge/keyguard_screen_status_port.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_tab_unlock.xml [moved from core/res/res/layout-xlarge/keyguard_screen_tab_unlock.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_tab_unlock_land.xml [moved from core/res/res/layout-xlarge/keyguard_screen_tab_unlock_land.xml with 100% similarity]
core/res/res/layout-large/keyguard_screen_unlock_landscape.xml [moved from core/res/res/layout-xlarge/keyguard_screen_unlock_landscape.xml with 96% similarity]
core/res/res/layout-large/keyguard_screen_unlock_portrait.xml [moved from core/res/res/layout-xlarge/keyguard_screen_unlock_portrait.xml with 100% similarity]

old mode 100755 (executable)
new mode 100644 (file)
index f524317..45cc20d
Binary files a/core/res/res/drawable-mdpi/btn_code_lock_default.png and b/core/res/res/drawable-mdpi/btn_code_lock_default.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 5cd436c..45cc20d
Binary files a/core/res/res/drawable-mdpi/btn_code_lock_touched.png and b/core/res/res/drawable-mdpi/btn_code_lock_touched.png differ
index 20f3d50..0fbdbfa 100644 (file)
Binary files a/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png and b/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png differ
index d09ce53..ae97453 100644 (file)
Binary files a/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png and b/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png differ
index a9e008c..4127d1e 100644 (file)
Binary files a/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png and b/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png differ
index 1ed3065..525ab8a 100644 (file)
Binary files a/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png and b/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png differ
index 5710ebf..eb05820 100644 (file)
Binary files a/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png and b/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png differ
index dd7d89e..416b2c7 100644 (file)
Binary files a/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png and b/core/res/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png differ
index d29c6c3..97ac023 100644 (file)
Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png and b/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 20d6320..4210db2
Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_charging.png and b/core/res/res/drawable-mdpi/ic_lock_idle_charging.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 0206aee..1060f5a
Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_lock.png and b/core/res/res/drawable-mdpi/ic_lock_idle_lock.png differ
old mode 100755 (executable)
new mode 100644 (file)
index bb96782..72e4afa
Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png and b/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png differ
index 7ddeba5..0bc86c3 100644 (file)
Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png and b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png differ
index 7201e58..2ab4547 100644 (file)
Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png and b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 8546c5f..fe72d00
Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png differ
old mode 100755 (executable)
new mode 100644 (file)
index a98a29a..be666c6
Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 6d579cb..9627197
Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png differ
index 0566e5a..91d6e32 100644 (file)
Binary files a/core/res/res/drawable-mdpi/sym_keyboard_shift.png and b/core/res/res/drawable-mdpi/sym_keyboard_shift.png differ
old mode 100755 (executable)
new mode 100644 (file)
index ccaf05d..2bd0536
Binary files a/core/res/res/drawable-mdpi/sym_keyboard_shift_locked.png and b/core/res/res/drawable-mdpi/sym_keyboard_shift_locked.png differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png b/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png
deleted file mode 100644 (file)
index 45cc20d..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png b/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png
deleted file mode 100644 (file)
index 45cc20d..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal.9.png b/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal.9.png
deleted file mode 100644 (file)
index 0fbdbfa..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal.9.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png b/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png
deleted file mode 100644 (file)
index ae97453..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_off.9.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png b/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png
deleted file mode 100644 (file)
index 4127d1e..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_normal_on.9.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed.9.png b/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
deleted file mode 100644 (file)
index 525ab8a..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed.9.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png b/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png
deleted file mode 100644 (file)
index eb05820..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_off.9.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png b/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png
deleted file mode 100644 (file)
index 416b2c7..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/btn_keyboard_key_fulltrans_pressed_on.9.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png
deleted file mode 100644 (file)
index 97ac023..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png
deleted file mode 100644 (file)
index 4210db2..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png
deleted file mode 100644 (file)
index 1060f5a..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png
deleted file mode 100644 (file)
index 72e4afa..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png
deleted file mode 100644 (file)
index 0bc86c3..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png
deleted file mode 100644 (file)
index 2ab4547..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png
deleted file mode 100644 (file)
index fe72d00..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png
deleted file mode 100644 (file)
index be666c6..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png
deleted file mode 100644 (file)
index 9627197..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png b/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png
deleted file mode 100644 (file)
index 91d6e32..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png and /dev/null differ
diff --git a/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked.png b/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked.png
deleted file mode 100644 (file)
index 2bd0536..0000000
Binary files a/core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked.png and /dev/null differ
     <RelativeLayout
         android:layout_weight="1"
         android:layout_width="0dip"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:gravity="center_vertical|center_horizontal">
 
         <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
             android:layout_width="354dip"
             android:layout_height="354dip"
-            android:layout_marginLeft="143dip"
-            android:layout_marginTop="201dip"
             android:layout_gravity="center_vertical"
         />