diff --git a/core/java/com/android/internal/widget/SlidingTab.java b/core/java/com/android/internal/widget/SlidingTab.java
index 4a411d78fc79e..6ea64609acdbe 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);
}
- public int getTabWidth() {
- return tab.getDrawable().getIntrinsicWidth();
+ /**
+ * 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.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
new file mode 100644
index 0000000000000..ca0a825ffe8e8
Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_jog_dial_answer.png differ
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
new file mode 100644
index 0000000000000..82237bdd8d514
Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_end.png differ
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
new file mode 100644
index 0000000000000..4946adab1e54b
Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png differ
diff --git a/core/res/res/drawable-hdpi/ic_jog_dial_decline.png b/core/res/res/drawable-hdpi/ic_jog_dial_decline.png
new file mode 100644
index 0000000000000..006a6e4f02dd9
Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_jog_dial_decline.png differ
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
deleted file mode 100644
index 92db44f5491f1..0000000000000
Binary files a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_gray.9.png and /dev/null differ
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
deleted file mode 100644
index 0bed1a0c54bfc..0000000000000
Binary files a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_green.9.png and /dev/null differ
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
deleted file mode 100644
index 81fbe5a427982..0000000000000
Binary files a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_red.9.png and /dev/null differ
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
deleted file mode 100644
index d9c33fb43a6a8..0000000000000
Binary files a/core/res/res/drawable-hdpi/jog_tab_bar_confirm_yellow.9.png and /dev/null differ
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
new file mode 100644
index 0000000000000..53ed1367cc585
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..64557908b2615
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..49bb9c1512525
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..b3c4c4c78dbc1
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..00dea6ecb4cd8
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..45b18508b0ca4
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png differ
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
deleted file mode 100644
index 1cf7f1c54816e..0000000000000
Binary files a/core/res/res/drawable-hdpi/jog_tab_bar_normal.9.png and /dev/null differ
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
deleted file mode 100644
index c7b367e41e421..0000000000000
Binary files a/core/res/res/drawable-hdpi/jog_tab_bar_pressed.9.png and /dev/null differ
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
new file mode 100644
index 0000000000000..35b35296f07a0
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..720de7f04a963
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..b3387be61344e
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..7ddfbcc6c5c3a
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..1855e5f622abf
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..844f30467a90f
Binary files /dev/null and b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png differ
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
deleted file mode 100644
index c0f7706e3475a..0000000000000
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_gray.9.png and /dev/null differ
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
deleted file mode 100644
index 0f2ce13920133..0000000000000
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_green.9.png and /dev/null differ
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
deleted file mode 100644
index a34eb7d362836..0000000000000
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_red.9.png and /dev/null differ
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
deleted file mode 100644
index e1433562a5dc1..0000000000000
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_bar_confirm_yellow.9.png and /dev/null differ
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
new file mode 100644
index 0000000000000..76f76bc1d83b4
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..d070fad280636
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..8d38ea6294572
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..2da4677c9d748
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..a18165297fbad
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..6cf31316b774d
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_left_end_pressed.9.png differ
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
deleted file mode 100644
index b5837f77bba4f..0000000000000
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_bar_normal.9.png and /dev/null differ
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
deleted file mode 100644
index 79ad83d0d0e23..0000000000000
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_bar_pressed.9.png and /dev/null differ
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
new file mode 100644
index 0000000000000..05541f37758cc
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..0bf0ea903d99f
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..b82a30f2ef17e
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..5f530fa0a95ea
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..d8bbd17087b20
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..c40808780796b
Binary files /dev/null and b/core/res/res/drawable-land-hdpi/jog_tab_bar_right_end_pressed.9.png differ
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
index 9c63b22df7442..dff38b4357d58 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png and b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_gray.png differ
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
index 4f9877c15bc27..88a95be8c8b85 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_green.png and b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_green.png differ
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
index bdce97d5866bd..b9486ea76fb14 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_red.png and b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_red.png differ
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
index 327fc2cc5d815..9144d7ab50efe 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png and b/core/res/res/drawable-land-hdpi/jog_tab_left_confirm_yellow.png differ
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
index e69d91cb8c226..b2d76954d8648 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_left_normal.png and b/core/res/res/drawable-land-hdpi/jog_tab_left_normal.png differ
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
index b6153d8af4479..55e170d418edf 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_left_pressed.png and b/core/res/res/drawable-land-hdpi/jog_tab_left_pressed.png differ
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
index 6e3e00b573fa1..131b7201baea8 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png and b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_gray.png differ
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
index dae9efcbfc2b4..c36b0adaffd8f 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_green.png and b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_green.png differ
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
index 9de3158b3ac4d..d388619d6dda1 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_red.png and b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_red.png differ
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
index 8c9f180c87b6c..24f1aec1ec086 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png and b/core/res/res/drawable-land-hdpi/jog_tab_right_confirm_yellow.png differ
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
index 0c4faf2ce5b9e..9111649a42fc7 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_right_normal.png and b/core/res/res/drawable-land-hdpi/jog_tab_right_normal.png differ
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
index 4ec7b56336791..3bd2e5ba441a9 100644
Binary files a/core/res/res/drawable-land-hdpi/jog_tab_right_pressed.png and b/core/res/res/drawable-land-hdpi/jog_tab_right_pressed.png differ
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
new file mode 100644
index 0000000000000..61222f41b8e92
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..3060f7264dcef
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..cee7bf501a246
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..4bd56d11d95f5
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..367e887c405b1
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..02f3f275505c6
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_left_end_pressed.9.png differ
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
new file mode 100644
index 0000000000000..bfaba2fe09558
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..d35fe7b25047f
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..508f6bdf5204d
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..a6041e5648a9c
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..28cdd0b2b7044
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..46ba76b974625
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_bar_right_end_pressed.9.png differ
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
new file mode 100644
index 0000000000000..396dcf7a3857a
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_gray.png differ
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
new file mode 100644
index 0000000000000..d928310762d04
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_green.png differ
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
new file mode 100644
index 0000000000000..c377463bd52cc
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_red.png differ
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
new file mode 100644
index 0000000000000..b868c76723787
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_left_confirm_yellow.png differ
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
new file mode 100644
index 0000000000000..5ca876bb81ccf
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_left_normal.png differ
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
new file mode 100644
index 0000000000000..8c33a782edadf
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_left_pressed.png differ
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
new file mode 100644
index 0000000000000..4f1a002a1bbbf
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_gray.png differ
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
new file mode 100644
index 0000000000000..af1550f44e9fd
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_green.png differ
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
new file mode 100644
index 0000000000000..b458d27c9e64c
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_red.png differ
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
new file mode 100644
index 0000000000000..8e55d6a7b0708
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_right_confirm_yellow.png differ
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
new file mode 100644
index 0000000000000..c607c7c0ca085
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_right_normal.png differ
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
new file mode 100644
index 0000000000000..2537d73f0c9d9
Binary files /dev/null and b/core/res/res/drawable-land-mdpi/jog_tab_right_pressed.png differ
diff --git a/core/res/res/drawable-mdpi/ic_jog_dial_answer.png b/core/res/res/drawable-mdpi/ic_jog_dial_answer.png
new file mode 100644
index 0000000000000..e2bc483de27ae
Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_jog_dial_answer.png differ
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
new file mode 100644
index 0000000000000..aa0fab224b558
Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_end.png differ
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
new file mode 100644
index 0000000000000..9effe375c3175
Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png differ
diff --git a/core/res/res/drawable-mdpi/ic_jog_dial_decline.png b/core/res/res/drawable-mdpi/ic_jog_dial_decline.png
new file mode 100644
index 0000000000000..81c76b59a453e
Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_jog_dial_decline.png differ
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
new file mode 100644
index 0000000000000..adbb146d6fa17
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..e8be7bf370b30
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..120a9d8878f8f
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..60ec1462a4b3e
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..747745378c7a7
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..c79a35cf3da82
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_left_end_pressed.9.png differ
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
new file mode 100644
index 0000000000000..4ce09fa3ca913
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_gray.9.png differ
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
new file mode 100644
index 0000000000000..9d7565fcde4e8
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_green.9.png differ
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
new file mode 100644
index 0000000000000..d5f9bd89b6f2d
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_red.9.png differ
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
new file mode 100644
index 0000000000000..5b9c5b490d0be
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_confirm_yellow.9.png differ
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
new file mode 100644
index 0000000000000..2e6ca2ebf201e
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_normal.9.png differ
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
new file mode 100644
index 0000000000000..f41750dae939c
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_bar_right_end_pressed.9.png differ
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
new file mode 100644
index 0000000000000..e8544ff9515a5
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_left_confirm_gray.png differ
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
new file mode 100644
index 0000000000000..d0ba8f8fbed58
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_left_confirm_green.png differ
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
new file mode 100644
index 0000000000000..5188c86cb8242
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_left_confirm_red.png differ
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
new file mode 100644
index 0000000000000..861e17a7f173e
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_left_confirm_yellow.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_left_normal.png b/core/res/res/drawable-mdpi/jog_tab_left_normal.png
new file mode 100644
index 0000000000000..7af1b855006b9
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_left_normal.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_left_pressed.png b/core/res/res/drawable-mdpi/jog_tab_left_pressed.png
new file mode 100644
index 0000000000000..b76e83e9573e0
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_left_pressed.png differ
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
new file mode 100644
index 0000000000000..814a50d25756a
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_right_confirm_gray.png differ
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
new file mode 100644
index 0000000000000..cf157fc837edd
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_right_confirm_green.png differ
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
new file mode 100644
index 0000000000000..74f2935c37692
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_right_confirm_red.png differ
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
new file mode 100644
index 0000000000000..66557319d14fa
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_right_confirm_yellow.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_right_normal.png b/core/res/res/drawable-mdpi/jog_tab_right_normal.png
new file mode 100644
index 0000000000000..479c9a5f2f52d
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_right_normal.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_right_pressed.png b/core/res/res/drawable-mdpi/jog_tab_right_pressed.png
new file mode 100644
index 0000000000000..454aaf2216de1
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_right_pressed.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_target_gray.png b/core/res/res/drawable-mdpi/jog_tab_target_gray.png
new file mode 100644
index 0000000000000..517b2534703bf
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_target_gray.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_target_green.png b/core/res/res/drawable-mdpi/jog_tab_target_green.png
new file mode 100644
index 0000000000000..188f3cc838c46
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_target_green.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_target_red.png b/core/res/res/drawable-mdpi/jog_tab_target_red.png
new file mode 100644
index 0000000000000..a36394dc51589
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_target_red.png differ
diff --git a/core/res/res/drawable-mdpi/jog_tab_target_yellow.png b/core/res/res/drawable-mdpi/jog_tab_target_yellow.png
new file mode 100644
index 0000000000000..ba999b10410e1
Binary files /dev/null and b/core/res/res/drawable-mdpi/jog_tab_target_yellow.png differ
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 b1d7c315166ba..32ce3dcda6565 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 @@
+ android:drawable="@drawable/jog_tab_bar_left_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_left_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_left_end_confirm_green" />
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 de1a42f0d61b5..7e381931a998e 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 @@
+ android:drawable="@drawable/jog_tab_bar_left_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_left_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_left_end_confirm_gray" />
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 b1d7c315166ba..32ce3dcda6565 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 @@
+ android:drawable="@drawable/jog_tab_bar_left_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_left_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_left_end_confirm_green" />
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 ae82aba2fb33e..83183ac1bc194 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 @@
+ android:drawable="@drawable/jog_tab_bar_right_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_right_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_right_end_confirm_red" />
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 de1a42f0d61b5..8797e155d5197 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 @@
+ android:drawable="@drawable/jog_tab_bar_right_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_right_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_right_end_confirm_gray" />
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 de1a42f0d61b5..8797e155d5197 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 @@
+ android:drawable="@drawable/jog_tab_bar_right_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_right_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_right_end_confirm_gray" />
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 febe32a1ed3e7..d66e1c2b31d93 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 @@
+ android:drawable="@drawable/jog_tab_bar_right_end_pressed" />
+ android:drawable="@drawable/jog_tab_bar_right_end_normal" />
+ android:drawable="@drawable/jog_tab_bar_right_end_confirm_yellow" />
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml
index 6f7010eb7041c..1991e988efd06 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"
/>
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 a9edb6bf0ef3d..5c802352a6a8e 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"
/>