Wale Ogunwale
41adfc4935
am ca1ce938: am 781ec7e9: am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()"
...
* commit 'ca1ce9382bff4adc1ae56e7d659da4190576ceb6':
Fix javadoc for Adapter.getViewTypeCount()
2015-06-23 17:39:28 +00:00
Wale Ogunwale
ca1ce9382b
am 781ec7e9: am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()"
...
* commit '781ec7e9d408dacfab761c02d6e4b1345c5dfd87':
Fix javadoc for Adapter.getViewTypeCount()
2015-06-23 17:28:30 +00:00
Alan Viverette
0ffb1bdfc9
am 7acc4a60: am 84340ab0: am ed0e11a9: Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev
...
* commit '7acc4a60ca0ddc10d26981e25f6c1e042ce139d6':
Ensure child is attached before performing measure/layout in Spinner
2015-06-23 03:04:36 +00:00
Alan Viverette
4f53b0ecc4
am 42f9a5a6: am 32bc28f4: am aeaa396c: Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev
...
* commit '42f9a5a6b74211b10927d8e95a04cd6a80efdd6d':
Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
2015-06-23 03:04:19 +00:00
Alan Viverette
ed0e11a93a
Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev
2015-06-22 23:07:33 +00:00
Alan Viverette
aeaa396cae
Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev
2015-06-22 22:38:09 +00:00
Alan Viverette
9554f9fc9e
Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
...
Turns out this was actually fine.
This reverts commit 9355533bf6
2015-06-22 22:37:58 +00:00
Alan Viverette
25c6cd61d4
Ensure child is attached before performing measure/layout in Spinner
...
Bug: 21614663
Change-Id: Id84a720fac7050d312eb2eb6f12621217c4f8d0f
2015-06-22 15:25:55 -07:00
Andrei Stingaceanu
ec9e10b74d
am 4ca5725f: am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode
...
* commit '4ca5725f95e613a9550f77e4ec155432141a8095':
Fix selection by double tap in Extracted mode
2015-06-22 13:36:36 +00:00
Andrei Stingaceanu
b1891b3fc9
Fix selection by double tap in Extracted mode
...
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.
Bug: 20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
2015-06-22 12:42:06 +01:00
Vladislav Kaznacheev
0796f25c0a
am 86578bee: am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev
...
* commit '86578bee880d33ac40bb002ffc717e471acda754':
Fix huge bounce-back in ListView when double-flinging
2015-06-22 09:59:01 +00:00
Vladislav Kaznacheev
8228e4247c
Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev
2015-06-22 09:30:20 +00:00
Minhyeok Jeong
ab1c9e0774
Fix javadoc for Adapter.getViewTypeCount()
...
Remove duplicate words.
Change-Id: Iaeeb8f74313d2ca88c28e4b3672316367b16ca2d
2015-06-21 04:51:22 +09:00
Doris Liu
11f80da4a0
am ec92ea39: am 5bfdb772: am 4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
...
* commit 'ec92ea3946311e177d5eeb14a5c6f885ca5311de':
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
2015-06-20 01:00:39 +00:00
Doris Liu
4a79992591
Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
2015-06-20 00:23:30 +00:00
Doris Liu
bcfdead943
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
...
The issue states that NumberPicker.setWrapSelectorWheel(false) only works
in a specific call order. The underlying problem is that NumberPicker
does not remember user's preference on whether the selector wheel should
be wrapped. Therefore, it only works when user sets their preference last,
after everything else that could affect the choice gets executed.
Bug: 19049714
Change-Id: Ic27d909cb3dd657993a4df9a04c819b6965ad11b
2015-06-19 16:33:39 -07:00
Alan Viverette
3d63af9c4d
am bbe35b32: am 0cadef68: am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev
...
* commit 'bbe35b32c2e1843d7d5f0ddde0063a4ead38a497':
Create ListPopupWindow handler against main looper
2015-06-19 20:43:42 +00:00
Alan Viverette
f3e8dca84b
Merge "Create ListPopupWindow handler against main looper" into mnc-dev
2015-06-19 19:21:11 +00:00
Alan Viverette
0204fd6a05
am 9e08cf8f: am 4e537151: am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
...
* commit '9e08cf8f8f05a0da0777408ee8e940622df39e93':
Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
2015-06-19 18:56:11 +00:00
Alan Viverette
7c669f4547
Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
2015-06-19 18:20:21 +00:00
Alan Viverette
9355533bf6
Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
...
This reverts commit 3e2e064a1f
2015-06-19 18:19:56 +00:00
Dan Sandler
2983f6ee42
am 2a0cc6cf: am 7a7e8fc8: am 11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
...
* commit '2a0cc6cf4dc61e03d5bb5348177cca95aeb0257d':
Announce chronometers with time-unit words.
2015-06-19 14:17:45 +00:00
Vladislav Kaznacheev
160d12ee51
Fix huge bounce-back in ListView when double-flinging
...
The bounce-back reliably happened when AbsListView.fling
was called with high enough velocity (>50000). Such values
caused integer overflow when squared in the course of some
ballistic calculations in OverScroller.fitOnBounceCurve.
Bug: 19056278
Change-Id: I35d5376c67bc6847955b44ee268e89bce2db81d0
2015-06-19 11:22:59 +03:00
Dan Sandler
11859eba4e
Merge "Announce chronometers with time-unit words." into mnc-dev
2015-06-19 00:50:59 +00:00
Alan Viverette
4a50723fe3
Create ListPopupWindow handler against main looper
...
Required for CTS tests.
Bug: 21664698
Change-Id: Id33c672d7d50a2162c519249bbbf5b8081faf830
2015-06-18 17:11:19 -07:00
Mady Mellor
06b9ede565
am 5765561f: am a0993670: am 03709c78: Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
...
* commit '5765561fa63e102721ef845767543859a28e9d1a':
Text selection: update touch delta when moving towards handles
2015-06-18 17:57:56 +00:00
Adam Powell
ed213cfea3
am 0f6dd549: am 7fd90265: am 2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
...
* commit '0f6dd54943f3b343406c655d3efc392ede0cf0ea':
Un-hide ViewGroup#onViewAdded/onViewRemoved
2015-06-18 17:57:51 +00:00
Mady Mellor
03709c780a
Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
2015-06-18 17:26:04 +00:00
Adam Powell
2a1f916418
Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
2015-06-18 17:20:44 +00:00
Adam Powell
6690d018b9
Un-hide ViewGroup#onViewAdded/onViewRemoved
...
These methods are generally useful for writing custom views, and by
exposing them we make it easier for custom view authors to still allow
app developers to use an OnHierarchyChangedListener since it will not
be occupied by a custom view's implementation.
Also move the actual dispatch to package-scoped dispatch methods so
that a developer forgetting to call super won't stop a listener from
functioning.
Bug 21866523
Change-Id: Ie2bb5e241d7c5a02a5033f33ecdaeb40aceb20b5
2015-06-18 10:19:18 -07:00
Mady Mellor
2b48782e36
am fd597de3: am 0bbabc03: am 9a08fe2a: Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
...
* commit 'fd597de38eb4477846be8046e96b2ab7cc68d183':
Update button press in AbsListView to use new MotionEvent APIs
2015-06-18 16:19:40 +00:00
Mady Mellor
9a08fe2aca
Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
2015-06-18 15:46:27 +00:00
Keisuke Kuroyanagi
12b92e57eb
am 4e0ff9c1: am 3e43afed: am fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
...
* commit '4e0ff9c124315a9dfbf987136f933a6e433c63f9':
Fix: Drag handle jumps between bidi boundaries.
2015-06-18 04:25:33 +00:00
Keisuke Kuroyanagi
fe67c1ec6d
Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
2015-06-18 03:43:44 +00:00
Chet Haase
9dff88c9d1
am 7751e2dc: am 2139e92c: am 45bb0ca4: Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
...
* commit '7751e2dc96c81035cb57cc69e86ba0762da71ce2':
ImageView updates cached drawable dimensions when drawable updates
2015-06-17 23:41:23 +00:00
Raph Levien
d5a0e5c84b
am fc40d939: am efe1f4bb: am 8872ca4d: Merge "Remove indents from TextView" into mnc-dev
...
* commit 'fc40d939819dca79cd02b7be93531cf2268bb9fa':
Remove indents from TextView
2015-06-17 23:41:15 +00:00
Alan Viverette
f8e35e9af6
am d496d3bd: am 5e034226: am e1c94726: Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
...
* commit 'd496d3bd061695240036e041f657794a0f054bfa':
Work around inconsistent views in RelativeLayout.onMeasure()
2015-06-17 23:26:59 +00:00
Chet Haase
45bb0ca49a
Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
2015-06-17 23:07:17 +00:00
Raph Levien
8872ca4d55
Merge "Remove indents from TextView" into mnc-dev
2015-06-17 23:06:17 +00:00
Raph Levien
8edac58e55
Remove indents from TextView
...
On more careful reflection, the "indents" feature was not ready for
inclusion in the public API. It is still available at a lower level
in StaticLayout.
Also fix a minor typo in the doc for breakStrategy.
Bug: 20641996
Change-Id: I5cd976a536c48615980860396b1564b51b19e14a
2015-06-17 15:53:33 -07:00
Chet Haase
8473f5a768
ImageView updates cached drawable dimensions when drawable updates
...
Changes to drawable dimensions were not propagated to cached dimension
values in ImageView. Now this is done when the drawable is invalidated.
Issue #18798152 ImageView caches wrong value of mDrawableWidth and mDrawableHeight
Change-Id: I8da7d82b0543fa02d8ef3d896595bd0e5ea2a61e
2015-06-17 15:28:25 -07:00
Alan Viverette
e1c947263f
Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
2015-06-17 22:10:11 +00:00
Adam Powell
5407bdcc34
am c0611fd7: am fb1fdca9: am 074c3404: Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
...
* commit 'c0611fd77e27addfdef8a2b870328b4985d28b91':
Add matching xml attributes for existing Toolbar properties
2015-06-17 21:03:52 +00:00
Alan Viverette
3e2e064a1f
Work around inconsistent views in RelativeLayout.onMeasure()
...
Previously, RelativeLayout's measure pass could crash if the view's
children were modified without calling requestLayout() prior to the
next measure pass. This avoids the issue by only looking at the most
recent set of sorted views and preserves the previous behavior where
onMeasure() could return incorrect data.
Bug: 21123292
Change-Id: If471d071d1d2e2729cf13854d95b1f517c1fe73a
2015-06-17 13:42:32 -07:00
Adam Powell
074c340420
Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
2015-06-17 20:22:37 +00:00
Yigit Boyar
8c184d3d51
am f8acc3af: am b2b53fb9: am 5ddaa72b: Merge "Handle negative view types properly in getScrapView" into mnc-dev
...
* commit 'f8acc3af12add21e64acd7a744234fe3f65c6096':
Handle negative view types properly in getScrapView
2015-06-17 18:33:48 +00:00
Mady Mellor
b5884ca1c0
am 4a392886: am 31fa5ad3: am 5279d11f: Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
...
* commit '4a39288618c3601fea0e176561ca9f6ee2a02163':
Drag to select text: add some slop for moving between lines
2015-06-17 18:12:32 +00:00
Yigit Boyar
5ddaa72b9a
Merge "Handle negative view types properly in getScrapView" into mnc-dev
2015-06-17 17:58:27 +00:00
Mady Mellor
ae7bc168ed
am 432e0422: am ef25faa0: am f0522882: Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev
...
* commit '432e0422ca8b85010bc489868ce34adabb02da0b':
Insertion cursor: add some slop for moving between lines
2015-06-17 17:39:23 +00:00
Mady Mellor
5279d11f25
Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
2015-06-17 17:36:31 +00:00
