diff options
| author | 2009-11-12 18:51:35 -0800 | |
|---|---|---|
| committer | 2009-11-12 18:51:35 -0800 | |
| commit | 11fea858b2f2d3f9c40a4da848d7bcee47edde04 (patch) | |
| tree | c0a07e22b5d5344a40bff4bddb5e229e49438c33 | |
| parent | 6f5ba93469bc26f33b5a260a394406970536c260 (diff) | |
| parent | 4811d62d5f07a1ffbf085d5e424e2b54d0e7ebfd (diff) | |
Merge change I8061e6ac into eclair
* changes:
Fix 2209086: Updated assets and fixed widget dimension calculation.
118 files changed, 49 insertions, 30 deletions
diff --git a/core/java/com/android/internal/widget/SlidingTab.java b/core/java/com/android/internal/widget/SlidingTab.java index 4a411d78fc79..6ea64609acdb 100644 --- a/core/java/com/android/internal/widget/SlidingTab.java +++ b/core/java/com/android/internal/widget/SlidingTab.java @@ -309,12 +309,30 @@ public class SlidingTab extends ViewGroup { setState(currentState); } + /** + * Ensure all the dependent widgets are measured. + */ + public void measure() { + tab.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), + View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); + text.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), + View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); + } + + /** + * Get the measured tab width. Must be called after {@link Slider#measure()}. + * @return + */ public int getTabWidth() { - return tab.getDrawable().getIntrinsicWidth(); + return tab.getMeasuredWidth(); } + /** + * Get the measured tab width. Must be called after {@link Slider#measure()}. + * @return + */ public int getTabHeight() { - return tab.getDrawable().getIntrinsicHeight(); + return tab.getMeasuredHeight(); } } @@ -360,11 +378,12 @@ public class SlidingTab extends ViewGroup { throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions"); } - final float density = mDensity; - final int leftTabWidth = (int) (density * mLeftSlider.getTabWidth() + 0.5f); - final int rightTabWidth = (int) (density * mRightSlider.getTabWidth() + 0.5f); - final int leftTabHeight = (int) (density * mLeftSlider.getTabHeight() + 0.5f); - final int rightTabHeight = (int) (density * mRightSlider.getTabHeight() + 0.5f); + mLeftSlider.measure(); + mRightSlider.measure(); + final int leftTabWidth = mLeftSlider.getTabWidth(); + final int rightTabWidth = mRightSlider.getTabWidth(); + final int leftTabHeight = mLeftSlider.getTabHeight(); + final int rightTabHeight = mRightSlider.getTabHeight(); final int width; final int height; if (isHorizontal()) { diff --git a/core/res/res/drawable-hdpi/ic_jog_dial_answer.png b/core/res/res/drawable-hdpi/ic_jog_dial_answer.png Binary files differnew file mode 100644 index 000000000000..ca0a825ffe8e --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_jog_dial_answer.png diff --git a/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_end.png b/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_end.png Binary files differnew file mode 100644 index 000000000000..82237bdd8d51 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_end.png diff --git a/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png b/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png Binary files differnew file mode 100644 index 000000000000..4946adab1e54 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png diff --git a/core/res/res/drawable-hdpi/ic_jog_dial_decline.png b/core/res/res/drawable-hdpi/ic_jog_dial_decline.png Binary files differnew file mode 100644 index 000000000000..006a6e4f02dd --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_jog_dial_decline.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_gray.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_confirm_gray.9.png Binary files differdeleted file mode 100644 index 92db44f5491f..000000000000 --- a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_gray.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_green.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_confirm_green.9.png Binary files differdeleted file mode 100644 index 0bed1a0c54bf..000000000000 --- a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_green.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_red.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_confirm_red.9.png Binary files differdeleted file mode 100644 index 81fbe5a42798..000000000000 --- a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_red.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_yellow.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_confirm_yellow.9.png Binary files differdeleted file mode 100644 index d9c33fb43a6a..000000000000 --- a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_yellow.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..53ed1367cc58 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..64557908b261 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..49bb9c151252 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..b3c4c4c78dbc --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..00dea6ecb4cd --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..45b18508b0ca --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_normal.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_normal.9.png Binary files differdeleted file mode 100644 index 1cf7f1c54816..000000000000 --- a/core/res/res/drawable-hdpi/jog_tab_bar_normal.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_pressed.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_pressed.9.png Binary files differdeleted file mode 100644 index c7b367e41e42..000000000000 --- a/core/res/res/drawable-hdpi/jog_tab_bar_pressed.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..35b35296f07a --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..720de7f04a96 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..b3387be61344 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..7ddfbcc6c5c3 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..1855e5f622ab --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..844f30467a90 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_gray.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_gray.9.png Binary files differdeleted file mode 100644 index c0f7706e3475..000000000000 --- a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_gray.9.png +++ /dev/null diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_green.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_green.9.png Binary files differdeleted file mode 100644 index 0f2ce1392013..000000000000 --- a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_green.9.png +++ /dev/null diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_red.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_red.9.png Binary files differdeleted file mode 100644 index a34eb7d36283..000000000000 --- a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_red.9.png +++ /dev/null diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_yellow.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_yellow.9.png Binary files differdeleted file mode 100644 index e1433562a5dc..000000000000 --- a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_yellow.9.png +++ /dev/null diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_gray.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..76f76bc1d83b --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_gray.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_green.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..d070fad28063 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_green.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_red.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..8d38ea629457 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_red.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..2da4677c9d74 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_normal.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..a18165297fba --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_normal.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_pressed.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..6cf31316b774 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_pressed.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_normal.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_normal.9.png Binary files differdeleted file mode 100644 index b5837f77bba4..000000000000 --- a/core/res/res/drawable-land-hdpi/jog_tab_bar_normal.9.png +++ /dev/null diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_pressed.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_pressed.9.png Binary files differdeleted file mode 100644 index 79ad83d0d0e2..000000000000 --- a/core/res/res/drawable-land-hdpi/jog_tab_bar_pressed.9.png +++ /dev/null diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_gray.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..05541f37758c --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_gray.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_green.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..0bf0ea903d99 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_green.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_red.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..b82a30f2ef17 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_red.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..5f530fa0a95e --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_normal.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..d8bbd17087b2 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_normal.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_pressed.9.png b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..c40808780796 --- /dev/null +++ b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_pressed.9.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png Binary files differindex 9c63b22df744..dff38b4357d5 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_green.png b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_green.png Binary files differindex 4f9877c15bc2..88a95be8c8b8 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_green.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_green.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_red.png b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_red.png Binary files differindex bdce97d5866b..b9486ea76fb1 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_red.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_red.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png Binary files differindex 327fc2cc5d81..9144d7ab50ef 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_left_normal.png b/core/res/res/drawable-land-hdpi/jog_tab_left_normal.png Binary files differindex e69d91cb8c22..b2d76954d864 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_left_normal.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_left_normal.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_left_pressed.png b/core/res/res/drawable-land-hdpi/jog_tab_left_pressed.png Binary files differindex b6153d8af447..55e170d418ed 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_left_pressed.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_left_pressed.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png Binary files differindex 6e3e00b573fa..131b7201baea 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_green.png b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_green.png Binary files differindex dae9efcbfc2b..c36b0adaffd8 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_green.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_green.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_red.png b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_red.png Binary files differindex 9de3158b3ac4..d388619d6dda 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_red.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_red.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png Binary files differindex 8c9f180c87b6..24f1aec1ec08 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_right_normal.png b/core/res/res/drawable-land-hdpi/jog_tab_right_normal.png Binary files differindex 0c4faf2ce5b9..9111649a42fc 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_right_normal.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_right_normal.png diff --git a/core/res/res/drawable-land-hdpi/jog_tab_right_pressed.png b/core/res/res/drawable-land-hdpi/jog_tab_right_pressed.png Binary files differindex 4ec7b5633679..3bd2e5ba441a 100644 --- a/core/res/res/drawable-land-hdpi/jog_tab_right_pressed.png +++ b/core/res/res/drawable-land-hdpi/jog_tab_right_pressed.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_gray.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..61222f41b8e9 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_gray.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_green.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..3060f7264dce --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_green.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_red.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..cee7bf501a24 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_red.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..4bd56d11d95f --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_normal.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..367e887c405b --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_normal.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_pressed.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..02f3f275505c --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_pressed.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_gray.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..bfaba2fe0955 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_gray.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_green.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..d35fe7b25047 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_green.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_red.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..508f6bdf5204 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_red.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..a6041e5648a9 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_normal.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..28cdd0b2b704 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_normal.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_pressed.9.png b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..46ba76b97462 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_pressed.9.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_gray.png b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_gray.png Binary files differnew file mode 100644 index 000000000000..396dcf7a3857 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_gray.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_green.png b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_green.png Binary files differnew file mode 100644 index 000000000000..d928310762d0 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_green.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_red.png b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_red.png Binary files differnew file mode 100644 index 000000000000..c377463bd52c --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_red.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_yellow.png b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_yellow.png Binary files differnew file mode 100644 index 000000000000..b868c7672378 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_yellow.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_left_normal.png b/core/res/res/drawable-land-mdpi/jog_tab_left_normal.png Binary files differnew file mode 100644 index 000000000000..5ca876bb81cc --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_left_normal.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_left_pressed.png b/core/res/res/drawable-land-mdpi/jog_tab_left_pressed.png Binary files differnew file mode 100644 index 000000000000..8c33a782edad --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_left_pressed.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_gray.png b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_gray.png Binary files differnew file mode 100644 index 000000000000..4f1a002a1bbb --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_gray.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_green.png b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_green.png Binary files differnew file mode 100644 index 000000000000..af1550f44e9f --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_green.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_red.png b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_red.png Binary files differnew file mode 100644 index 000000000000..b458d27c9e64 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_red.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_yellow.png b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_yellow.png Binary files differnew file mode 100644 index 000000000000..8e55d6a7b070 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_yellow.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_right_normal.png b/core/res/res/drawable-land-mdpi/jog_tab_right_normal.png Binary files differnew file mode 100644 index 000000000000..c607c7c0ca08 --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_right_normal.png diff --git a/core/res/res/drawable-land-mdpi/jog_tab_right_pressed.png b/core/res/res/drawable-land-mdpi/jog_tab_right_pressed.png Binary files differnew file mode 100644 index 000000000000..2537d73f0c9d --- /dev/null +++ b/core/res/res/drawable-land-mdpi/jog_tab_right_pressed.png diff --git a/core/res/res/drawable-mdpi/ic_jog_dial_answer.png b/core/res/res/drawable-mdpi/ic_jog_dial_answer.png Binary files differnew file mode 100644 index 000000000000..e2bc483de27a --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_jog_dial_answer.png diff --git a/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_end.png b/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_end.png Binary files differnew file mode 100644 index 000000000000..aa0fab224b55 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_end.png diff --git a/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png b/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png Binary files differnew file mode 100644 index 000000000000..9effe375c317 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png diff --git a/core/res/res/drawable-mdpi/ic_jog_dial_decline.png b/core/res/res/drawable-mdpi/ic_jog_dial_decline.png Binary files differnew file mode 100644 index 000000000000..81c76b59a453 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_jog_dial_decline.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_gray.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..adbb146d6fa1 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_gray.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_green.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..e8be7bf370b3 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_green.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_red.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..120a9d8878f8 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_red.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..60ec1462a4b3 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_left_end_normal.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..747745378c7a --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_normal.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_left_end_pressed.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..c79a35cf3da8 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_pressed.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_gray.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_gray.9.png Binary files differnew file mode 100644 index 000000000000..4ce09fa3ca91 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_gray.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_green.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_green.9.png Binary files differnew file mode 100644 index 000000000000..9d7565fcde4e --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_green.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_red.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_red.9.png Binary files differnew file mode 100644 index 000000000000..d5f9bd89b6f2 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_red.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png Binary files differnew file mode 100644 index 000000000000..5b9c5b490d0b --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_right_end_normal.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_normal.9.png Binary files differnew file mode 100644 index 000000000000..2e6ca2ebf201 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_normal.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_bar_right_end_pressed.9.png b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_pressed.9.png Binary files differnew file mode 100644 index 000000000000..f41750dae939 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_pressed.9.png diff --git a/core/res/res/drawable-mdpi/jog_tab_left_confirm_gray.png b/core/res/res/drawable-mdpi/jog_tab_left_confirm_gray.png Binary files differnew file mode 100644 index 000000000000..e8544ff9515a --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_left_confirm_gray.png diff --git a/core/res/res/drawable-mdpi/jog_tab_left_confirm_green.png b/core/res/res/drawable-mdpi/jog_tab_left_confirm_green.png Binary files differnew file mode 100644 index 000000000000..d0ba8f8fbed5 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_left_confirm_green.png diff --git a/core/res/res/drawable-mdpi/jog_tab_left_confirm_red.png b/core/res/res/drawable-mdpi/jog_tab_left_confirm_red.png Binary files differnew file mode 100644 index 000000000000..5188c86cb824 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_left_confirm_red.png diff --git a/core/res/res/drawable-mdpi/jog_tab_left_confirm_yellow.png b/core/res/res/drawable-mdpi/jog_tab_left_confirm_yellow.png Binary files differnew file mode 100644 index 000000000000..861e17a7f173 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_left_confirm_yellow.png diff --git a/core/res/res/drawable-mdpi/jog_tab_left_normal.png b/core/res/res/drawable-mdpi/jog_tab_left_normal.png Binary files differnew file mode 100644 index 000000000000..7af1b855006b --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_left_normal.png diff --git a/core/res/res/drawable-mdpi/jog_tab_left_pressed.png b/core/res/res/drawable-mdpi/jog_tab_left_pressed.png Binary files differnew file mode 100644 index 000000000000..b76e83e9573e --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_left_pressed.png diff --git a/core/res/res/drawable-mdpi/jog_tab_right_confirm_gray.png b/core/res/res/drawable-mdpi/jog_tab_right_confirm_gray.png Binary files differnew file mode 100644 index 000000000000..814a50d25756 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_right_confirm_gray.png diff --git a/core/res/res/drawable-mdpi/jog_tab_right_confirm_green.png b/core/res/res/drawable-mdpi/jog_tab_right_confirm_green.png Binary files differnew file mode 100644 index 000000000000..cf157fc837ed --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_right_confirm_green.png diff --git a/core/res/res/drawable-mdpi/jog_tab_right_confirm_red.png b/core/res/res/drawable-mdpi/jog_tab_right_confirm_red.png Binary files differnew file mode 100644 index 000000000000..74f2935c3769 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_right_confirm_red.png diff --git a/core/res/res/drawable-mdpi/jog_tab_right_confirm_yellow.png b/core/res/res/drawable-mdpi/jog_tab_right_confirm_yellow.png Binary files differnew file mode 100644 index 000000000000..66557319d14f --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_right_confirm_yellow.png diff --git a/core/res/res/drawable-mdpi/jog_tab_right_normal.png b/core/res/res/drawable-mdpi/jog_tab_right_normal.png Binary files differnew file mode 100644 index 000000000000..479c9a5f2f52 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_right_normal.png diff --git a/core/res/res/drawable-mdpi/jog_tab_right_pressed.png b/core/res/res/drawable-mdpi/jog_tab_right_pressed.png Binary files differnew file mode 100644 index 000000000000..454aaf2216de --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_right_pressed.png diff --git a/core/res/res/drawable-mdpi/jog_tab_target_gray.png b/core/res/res/drawable-mdpi/jog_tab_target_gray.png Binary files differnew file mode 100644 index 000000000000..517b2534703b --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_target_gray.png diff --git a/core/res/res/drawable-mdpi/jog_tab_target_green.png b/core/res/res/drawable-mdpi/jog_tab_target_green.png Binary files differnew file mode 100644 index 000000000000..188f3cc838c4 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_target_green.png diff --git a/core/res/res/drawable-mdpi/jog_tab_target_red.png b/core/res/res/drawable-mdpi/jog_tab_target_red.png Binary files differnew file mode 100644 index 000000000000..a36394dc5158 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_target_red.png diff --git a/core/res/res/drawable-mdpi/jog_tab_target_yellow.png b/core/res/res/drawable-mdpi/jog_tab_target_yellow.png Binary files differnew file mode 100644 index 000000000000..ba999b10410e --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_tab_target_yellow.png diff --git a/core/res/res/drawable/jog_tab_bar_left_answer.xml b/core/res/res/drawable/jog_tab_bar_left_answer.xml index b1d7c315166b..32ce3dcda656 100644 --- a/core/res/res/drawable/jog_tab_bar_left_answer.xml +++ b/core/res/res/drawable/jog_tab_bar_left_answer.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_left_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_left_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_green" /> + android:drawable="@drawable/jog_tab_bar_left_end_confirm_green" /> </selector> diff --git a/core/res/res/drawable/jog_tab_bar_left_generic.xml b/core/res/res/drawable/jog_tab_bar_left_generic.xml index de1a42f0d61b..7e381931a998 100644 --- a/core/res/res/drawable/jog_tab_bar_left_generic.xml +++ b/core/res/res/drawable/jog_tab_bar_left_generic.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_left_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_left_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_gray" /> + android:drawable="@drawable/jog_tab_bar_left_end_confirm_gray" /> </selector> diff --git a/core/res/res/drawable/jog_tab_bar_left_unlock.xml b/core/res/res/drawable/jog_tab_bar_left_unlock.xml index b1d7c315166b..32ce3dcda656 100644 --- a/core/res/res/drawable/jog_tab_bar_left_unlock.xml +++ b/core/res/res/drawable/jog_tab_bar_left_unlock.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_left_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_left_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_green" /> + android:drawable="@drawable/jog_tab_bar_left_end_confirm_green" /> </selector> diff --git a/core/res/res/drawable/jog_tab_bar_right_decline.xml b/core/res/res/drawable/jog_tab_bar_right_decline.xml index ae82aba2fb33..83183ac1bc19 100644 --- a/core/res/res/drawable/jog_tab_bar_right_decline.xml +++ b/core/res/res/drawable/jog_tab_bar_right_decline.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_right_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_right_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_red" /> + android:drawable="@drawable/jog_tab_bar_right_end_confirm_red" /> </selector> diff --git a/core/res/res/drawable/jog_tab_bar_right_generic.xml b/core/res/res/drawable/jog_tab_bar_right_generic.xml index de1a42f0d61b..8797e155d519 100644 --- a/core/res/res/drawable/jog_tab_bar_right_generic.xml +++ b/core/res/res/drawable/jog_tab_bar_right_generic.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_right_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_right_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_gray" /> + android:drawable="@drawable/jog_tab_bar_right_end_confirm_gray" /> </selector> diff --git a/core/res/res/drawable/jog_tab_bar_right_sound_off.xml b/core/res/res/drawable/jog_tab_bar_right_sound_off.xml index de1a42f0d61b..8797e155d519 100644 --- a/core/res/res/drawable/jog_tab_bar_right_sound_off.xml +++ b/core/res/res/drawable/jog_tab_bar_right_sound_off.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_right_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_right_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_gray" /> + android:drawable="@drawable/jog_tab_bar_right_end_confirm_gray" /> </selector> diff --git a/core/res/res/drawable/jog_tab_bar_right_sound_on.xml b/core/res/res/drawable/jog_tab_bar_right_sound_on.xml index febe32a1ed3e..d66e1c2b31d9 100644 --- a/core/res/res/drawable/jog_tab_bar_right_sound_on.xml +++ b/core/res/res/drawable/jog_tab_bar_right_sound_on.xml @@ -17,12 +17,12 @@ <!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/jog_tab_bar_pressed" /> + android:drawable="@drawable/jog_tab_bar_right_end_pressed" /> <item android:state_enabled="true" - android:drawable="@drawable/jog_tab_bar_normal" /> + android:drawable="@drawable/jog_tab_bar_right_end_normal" /> <item android:state_active="true" - android:drawable="@drawable/jog_tab_bar_confirm_yellow" /> + android:drawable="@drawable/jog_tab_bar_right_end_confirm_yellow" /> </selector> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 6f7010eb7041..1991e988efd0 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -131,7 +131,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="50dip" + android:layout_marginBottom="80dip" /> <!-- emergency call button shown when sim is missing or PUKd --> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index a9edb6bf0ef3..5c802352a6a8 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -140,7 +140,7 @@ android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="fill_parent" - android:layout_marginRight="50dip" + android:layout_marginRight="80dip" /> </LinearLayout> |
