From b971b89c78db541a8e924370d064e6d777e88095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Gruszczy=C5=84ski?= <gruszczy@google.com>
Date: Wed, 5 Mar 2014 12:59:58 -0800
Subject: [PATCH 1/2] Set android:descendantFocusability to blocksDescendants
 for all NumberPicker in clockwork.

Change-Id: I125c4a00f4061ef6756e719e7f6b9e5f4dd72d81
---
 core/res/res/values/styles_micro.xml | 1 +
 core/res/res/values/themes_micro.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values/styles_micro.xml b/core/res/res/values/styles_micro.xml
index b368b6577d827..c35bd48187f8b 100644
--- a/core/res/res/values/styles_micro.xml
+++ b/core/res/res/values/styles_micro.xml
@@ -29,5 +29,6 @@
         <item name="android:internalMinWidth">64dip</item>
         <item name="android:internalMaxHeight">180dip</item>
         <item name="virtualButtonPressedDrawable">?android:attr/selectableItemBackground</item>
+        <item name="android:descendantFocusability">blocksDescendants</item>
     </style>
 </resources>
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml
index 42f64fe643ff3..e429f96928d6d 100644
--- a/core/res/res/values/themes_micro.xml
+++ b/core/res/res/values/themes_micro.xml
@@ -31,7 +31,7 @@
         <item name="windowSwipeToDismiss">true</item>
     </style>
     <style name="Theme.Micro.Light" parent="Theme.Holo.Light">
-		<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
+        <item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
         <item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item>
         <item name="windowIsFloating">false</item>
         <item name="windowIsTranslucent">true</item>
@@ -47,7 +47,7 @@
     </style>
     <style name="Theme.Micro.Light.DarkActionBar" parent="Theme.Holo.Light.DarkActionBar">
         <item name="textViewStyle">@android:style/Widget.Micro.TextView</item>
-		<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
+        <item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
         <item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item>
         <item name="windowIsFloating">false</item>
         <item name="windowIsTranslucent">true</item>

From c16ba8cda7f16970debba9df9bbc168a9c7c1797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Gruszczy=C5=84ski?= <gruszczy@google.com>
Date: Wed, 5 Mar 2014 14:43:49 -0800
Subject: [PATCH 2/2] Passing and using defStyle in ViewGroup
 initFromAttributes.

Change-Id: I2104037d6f701aa3a27bf09226aca171ec77495d
---
 core/java/android/view/ViewGroup.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 94142376b2632..5763e72eb0626 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -463,13 +463,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
     public ViewGroup(Context context, AttributeSet attrs) {
         super(context, attrs);
         initViewGroup();
-        initFromAttributes(context, attrs);
+        initFromAttributes(context, attrs, 0);
     }
 
     public ViewGroup(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         initViewGroup();
-        initFromAttributes(context, attrs);
+        initFromAttributes(context, attrs, defStyle);
     }
 
     private boolean debugDraw() {
@@ -499,9 +499,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         mPersistentDrawingCache = PERSISTENT_SCROLLING_CACHE;
     }
 
-    private void initFromAttributes(Context context, AttributeSet attrs) {
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.ViewGroup);
+    private void initFromAttributes(Context context, AttributeSet attrs, int defStyle) {
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup, defStyle, 0);
 
         final int N = a.getIndexCount();
         for (int i = 0; i < N; i++) {