Deepanshu Gupta
02cab444fb
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
automerge: f4d3973
* commit 'f4d3973c319502fc8aa3e1aa1d7e7502274ea3aa':
resolved conflicts for a0bc2e7e to lmp-mr1-dev
2015-01-05 23:39:03 +00:00
Deepanshu Gupta
f4d3973c31
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '9c8f8ed8a8bee42ee48a27b055b11ace6255d09a':
resolved conflicts for a0bc2e7e to lmp-mr1-dev
2015-01-05 23:36:57 +00:00
Deepanshu Gupta
4a5baeaec9
Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
2015-01-05 23:26:04 +00:00
Alan Viverette
a1d11273d3
am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
...
automerge: 3f5f13d
* commit '3f5f13d7efb2756d5b9a2cc34c30ac23ced3947f':
Fix selector bug
2015-01-05 20:36:30 +00:00
Alan Viverette
3f5f13d7ef
am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
...
* commit '154d251ee61ad9c3d64b5c6db2d74806f4fd5782':
Fix selector bug
2015-01-05 20:34:08 +00:00
Alan Viverette
22a3163f1d
Merge "Fix selector bug" into lmp-mr1-dev
2015-01-05 20:23:47 +00:00
Alan Viverette
f35d2a0cb4
am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths
...
automerge: 97b2d18
* commit '97b2d185b655186664ce5402fbce37faaafddf1d':
Use min when comparing AM and PM text lengths
2015-01-05 20:14:32 +00:00
Alan Viverette
97b2d185b6
am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths
...
* commit 'db7eefbbfdc8c77c03b43fd58bcd461b8e52b20e':
Use min when comparing AM and PM text lengths
2015-01-05 20:11:57 +00:00
Alan Viverette
dd50858121
Use min when comparing AM and PM text lengths
...
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.
BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
2015-01-05 11:28:12 -08:00
Deepanshu Gupta
f5b02eb7c4
resolved conflicts for a0bc2e7e to lmp-mr1-dev
...
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.
This change also fixes the typo in the original change which was fixed
in a subsequent change.
Original commit: 12b6d29b7b
fix for typo: cb09bc45c5
Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
2014-12-30 14:07:29 -08:00
Chet Haase
2167b11de6
Fix selector bug
...
Issue #18784539 Row stays highlighted if I begin scrolling after the rows been highlighted in "About phone"
Change-Id: Ia91467d8fe64eec077f20af70eae0d5bb070c255
2014-12-19 16:37:18 -08:00
Alan Viverette
4ae0d9045f
am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
...
automerge: 878a5a6
* commit '878a5a6cd7109183928b9b8b533f11347fd0591a':
Give accessibility delegate the first pass at handling ACTION_CLICK
2014-12-15 17:41:55 +00:00
Alan Viverette
f19ef0fdc3
am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev
...
automerge: 37ea640
* commit '37ea640fa9e8de304ce5f9c9576e370baa85929e':
Avoid self-recursion if client calls init() from date listener
2014-12-15 17:40:42 +00:00
Alan Viverette
878a5a6cd7
am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
...
* commit '2f11125a7186cc65713804c939a0e538538d9f35':
Give accessibility delegate the first pass at handling ACTION_CLICK
2014-12-15 17:38:25 +00:00
Alan Viverette
37ea640fa9
am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev
...
* commit '2311ded6a3da117aee221c0cf1168c24160d9041':
Avoid self-recursion if client calls init() from date listener
2014-12-15 17:38:19 +00:00
Alan Viverette
9973643bfc
Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
2014-12-15 17:27:24 +00:00
Alan Viverette
0cecbc9c72
Avoid self-recursion if client calls init() from date listener
...
BUG: 18736166
Change-Id: Ibe04040356f4a3e4479ea55c53a0e167144ff877
2014-12-12 14:32:43 -08:00
Alan Viverette
cd305ae3ce
Give accessibility delegate the first pass at handling ACTION_CLICK
...
Delegation is broken for widgets, but this fixes the most egregious issue
where TextViews that are top-level list items weren't handling CLICK
actions correctly. This will still need work, since now the focus action
won't run, but it's an improvement.
BUG: 18736135
Change-Id: I808ef628198946cc87f13c53d6245cd162a1e517
2014-12-12 14:13:24 -08:00
Alan Viverette
040b761af9
am 3ead4127: am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev automerge: 4b7f724
...
* commit '3ead4127ae493508d064e106ec12f299e7116e8a':
Improve time picker accessibility
2014-12-12 04:26:12 +00:00
Alan Viverette
3ead4127ae
am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
...
automerge: 4b7f724
* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
Improve time picker accessibility
2014-12-12 04:21:42 +00:00
Alan Viverette
ff44188309
Merge "Improve time picker accessibility" into lmp-mr1-dev
2014-12-11 22:11:56 +00:00
Alan Viverette
302ce540a0
am 9e8fbe42: am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
...
* commit '9e8fbe42e96180f99fb2e2c4eccaa0441eb89b75':
Always call onDateChanged() when the date picker selection changes
2014-12-11 01:38:48 +00:00
Alan Viverette
9e8fbe42e9
am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
...
* commit '7171bf40eca7dc0a044f0378082d7f7c1dfa2348':
Always call onDateChanged() when the date picker selection changes
2014-12-11 00:07:32 +00:00
Alan Viverette
e6ec07fc5d
Always call onDateChanged() when the date picker selection changes
...
BUG: 18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
2014-12-10 11:24:27 -08:00
Alan Viverette
3fc00e3139
Improve time picker accessibility
...
Overrides click action description for TimePicker hour/minute selectors
and manually specifies traversal order for radial time picker nodes.
BUG: 17468036
Change-Id: I4472b42a95d762085d7a4d382feb2b9216c0d41c
2014-12-10 09:46:49 -08:00
Alan Viverette
48614536a7
am 2bbf5575: am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
...
* commit '2bbf5575e71f414d7ad8333d5daeef13ace04cfa':
Fix auto-advance regression in radial time picker
2014-12-09 23:21:43 +00:00
Alan Viverette
8249a61c66
am f758af4e: am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
...
* commit 'f758af4e72db1055bae180b3ac92a8194b8653fd':
Let host view handle long-press when using drag-to-open
2014-12-09 23:20:11 +00:00
Alan Viverette
72098499af
am b0efde16: am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev
...
* commit 'b0efde16ea2418e63e535aa186b5df1352209d1a':
Fix regression, don't NPE if Switch doesn't have a thumb set
2014-12-09 23:20:07 +00:00
Svet Ganov
70acef7df4
am aad2ffe6: am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit 'aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 23:20:02 +00:00
Alan Viverette
d3a0da9aac
am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
...
* commit '5a50a8bcabdb2593b48b06854a7455318399b6d1':
Fix hotspot coordinate propagation in ViewGroup and AbsListView
2014-12-09 22:23:37 +00:00
Alan Viverette
2bbf5575e7
am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
...
* commit '4b944f3ab8cd9959ccba3cee4cfd9fb36ab15a3a':
Fix auto-advance regression in radial time picker
2014-12-09 00:30:49 +00:00
Alan Viverette
f758af4e72
am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
...
* commit '32230b2bdec14f33d793f8f3c89673b648139170':
Let host view handle long-press when using drag-to-open
2014-12-09 00:17:44 +00:00
Alan Viverette
b0efde16ea
am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev
...
* commit '5a8b956fd22ffd2d4d54b47109c79748ff723d90':
Fix regression, don't NPE if Switch doesn't have a thumb set
2014-12-09 00:17:37 +00:00
Svet Ganov
aad2ffe67a
am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit '7f980d7508cab2bc9c4f84e5ea15984e284dbbb7':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 00:17:31 +00:00
Alan Viverette
7781647aa9
Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
2014-12-09 00:08:01 +00:00
Alan Viverette
11a68e1803
Fix auto-advance regression in radial time picker
...
If autoAdvance is set, we need to always fire the listener. We should
create a separate callback for auto-advance, but this is a minimal fix.
BUG: 18654878
Change-Id: Ie7b8a3ff91761325a508f580b27fa3b08f7b4e16
2014-12-08 15:54:38 -08:00
Alan Viverette
882a1e8974
Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
2014-12-08 21:29:08 +00:00
Alan Viverette
db82c9e00e
Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev
2014-12-08 21:29:04 +00:00
Svet Ganov
381a423634
Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
2014-12-08 21:28:19 +00:00
Alan Viverette
01a0963006
Fix regression, don't NPE if Switch doesn't have a thumb set
...
BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3
2014-12-08 13:02:06 -08:00
Alan Viverette
298536b1a0
Let host view handle long-press when using drag-to-open
...
BUG: 18605860
Change-Id: I75850138614f17cf728d4411c142a07bdf15d085
2014-12-08 12:31:14 -08:00
Alan Viverette
5a50a8bcab
am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
...
* commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62':
Fix hotspot coordinate propagation in ViewGroup and AbsListView
2014-12-08 19:45:20 +00:00
Alan Viverette
b942b6f15c
Fix hotspot coordinate propagation in ViewGroup and AbsListView
...
There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.
BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
2014-12-08 10:37:39 -08:00
Svet Ganov
b3fa2787ea
When accessibility on cannot click on a view covered by a HorizontalScrollView
...
In accessibility mode we send down and up events activate a view. We will later
switch to accessibility actions but for now as a bridge-gap we compute a point on
the screen where to click for activating the view. The heuristic we use has edge
cases such as a view that handles all touch events but does not have any listeners.
In this case we do not ignore the target view's area covered by a view that handles
all touch events. As a result we click on the wrong target. While we cannot solve
this generically, in the case of standard components such as HorizontalScrollView
we can.
bug:18612258
Change-Id: If8482aac0d0ea53c5c90367d099d1b8d3a4559ed
2014-12-05 13:13:15 -08:00
Adam Powell
5cd6f61f7d
am 19623538: am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
...
* commit '19623538735fac497325e2082a0ba56c199fc6b1':
Fix NullPointerException in ListView
2014-12-05 19:48:05 +00:00
Adam Powell
1962353873
am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
...
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
Fix NullPointerException in ListView
2014-12-05 19:39:25 +00:00
Adam Powell
8c9283f410
Merge "Fix NullPointerException in ListView"
2014-12-05 19:26:18 +00:00
Alan Viverette
d02bc7c5a8
am 4483f461: am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
...
* commit '4483f4611ee002b57f851aa3268ff610023c72c5':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
2014-12-03 17:18:53 +00:00
Alan Viverette
4483f4611e
am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
...
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
2014-12-03 07:56:12 +00:00
Alan Viverette
5c39807a57
am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp
...
* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
Consider RTL layout in DPAD navigation in AbsSeekBar
2014-12-03 00:29:46 +00:00