Svet Ganov
1301446c01
am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit 'e608644a9f0fa54a05379c171814569816145801':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 21:02:24 +00:00
Svet Ganov
e608644a9f
am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 20:54:38 +00:00
Svet Ganov
7486bc1f5a
Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
2014-12-12 20:48:09 +00:00
Adam Powell
097e3830cd
am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
Have ViewGroups without a parent clip child visible rects to bounds
2014-12-12 18:49:37 +00:00
Adam Powell
746079e2ee
am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
Have ViewGroups without a parent clip child visible rects to bounds
2014-12-12 18:43:38 +00:00
Adam Powell
9a0799cf6b
Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
2014-12-12 18:37:33 +00:00
Svet Ganov
9fc96c5371
Fix an edge case in computing click location in accessibility mode.
...
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.
bug:18672945
Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
2014-12-11 22:33:48 -08:00
Alan Viverette
3ead4127ae
am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
...
automerge: 4b7f724
2014-12-12 04:21:42 +00:00
Ruben Brunk
c7c20b34ec
am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
...
automerge: 81b381b
2014-12-12 04:09:55 +00:00
Alan Viverette
4b7f724fb2
am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
...
* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
Improve time picker accessibility
2014-12-11 22:19:07 +00:00
Alan Viverette
ff44188309
Merge "Improve time picker accessibility" into lmp-mr1-dev
2014-12-11 22:11:56 +00:00
Ruben Brunk
81b381b82e
am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
...
* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
camera2: Fix LEGACY YUV production and orientation.
2014-12-11 19:55:02 +00:00
Ruben Brunk
f6ed526b3a
Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
2014-12-11 19:48:37 +00:00
Ruben Brunk
433e715cc0
camera2: Fix LEGACY YUV production and orientation.
...
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
2014-12-11 11:35:46 -08:00
Robert Greenwalt
46765a0fbc
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
...
automerge: 911bcea
2014-12-11 18:07:53 +00:00
Robert Greenwalt
911bceab1e
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
...
* commit 'bde00a2b5c8c506b79e0724021a0711bde207c25':
Add toString in NetworkFactory.
2014-12-11 17:03:57 +00:00
Robert Greenwalt
bde00a2b5c
Merge "Add toString in NetworkFactory." into lmp-mr1-dev
2014-12-11 16:59:13 +00:00
Paul Jensen
8f58207319
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
...
automerge: d9d48cc
2014-12-11 05:49:18 +00:00
Paul Jensen
d9d48cc9c7
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
...
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
Fix several HTTP proxy issues with multinetworking.
2014-12-11 04:55:52 +00:00
Paul Jensen
2122e14cca
Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
2014-12-11 04:51:16 +00:00
Robert Greenwalt
6b746b5e14
Add toString in NetworkFactory.
...
Needed some additional logging to track down this bug
so add toString to capture the state.
bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
2014-12-10 19:04:50 -08:00
Adam Powell
35da41e6c3
Have ViewGroups without a parent clip child visible rects to bounds
...
getChildVisibleRect was enhanced to obey the official contracts for
clipping children and clip to padding. Unfortunately this meant that
ViewGroups with no parent have no way of checking if they will be
clipped to their own bounds and therefore should clip a child rect.
Treat orphaned view subtrees as entities that clip to the root view
bounds to preserve prior CTS guarantees.
Bug 18642973
Change-Id: I9fcbeb0e92cd6715cd9184183d36889614ed0bed
2014-12-10 18:59:34 -08:00
Dianne Hackborn
b56e98da8b
am 84adc43a: Merge "Fix issue #18706195 : Improve label names of memory types" into lmp-mr1-dev
...
automerge: 0f050ea#18706195 : Improve label names of memory types
2014-12-11 02:10:23 +00:00
Dianne Hackborn
0f050ea402
am 84adc43a: Merge "Fix issue #18706195 : Improve label names of memory types" into lmp-mr1-dev
...
* commit '84adc43a70302278eea4d9c198e14c88d6432f9c':
Fix issue #18706195 : Improve label names of memory types
2014-12-11 02:05:11 +00:00
Dianne Hackborn
1353df5655
Fix issue #18706195 : Improve label names of memory types
...
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
2014-12-10 16:54:13 -08: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
7171bf40ec
am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
...
* commit '6c42ee470307eee56a21062ad67b67878aa9392d':
Always call onDateChanged() when the date picker selection changes
2014-12-10 22:12:04 +00:00
Paul Jensen
e0bef71662
Fix several HTTP proxy issues with multinetworking.
...
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
not just the default network.
2. When a process is bound to a particular Network, update the proxy
system properties to those for the bound Network, and keep them
updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.
bug:17905627
bug:17420465
bug:18144582
(cherry-pick of https://android-review.googlesource.com/#/c/115170 )
Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
2014-12-10 15:22:12 -05: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
Dianne Hackborn
9b287368b0
am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
...
automerge: 7557ec1#18665625 CTS:android.app.cts.InstrumentationTest#...
2014-12-10 19:21:58 +00:00
Craig Mautner
647130baac
am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
...
automerge: 8642803
2014-12-10 19:17:53 +00:00
Erik Kline
34b3b53f9c
am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
...
automerge: 56d2e8f
2014-12-10 19:06:50 +00:00
Andre Eisenbach
f60f29d060
am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
...
automerge: e832393
2014-12-10 18:49:41 +00: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
Dianne Hackborn
7557ec128f
am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
...
* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
2014-12-10 17:29:35 +00:00
Dianne Hackborn
6bdbae07cf
Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
2014-12-10 17:23:07 +00:00
Craig Mautner
864280369c
am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
...
* commit '7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
Add put/getBoolean/Array to PersistableBundle
2014-12-10 17:02:10 +00:00
Craig Mautner
7a17e0b601
Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
2014-12-10 16:56:15 +00:00
Erik Kline
56d2e8fb7b
am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
...
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb
Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
2014-12-10 07:29:47 +00:00
Dianne Hackborn
80b1c5608e
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
...
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.
Check for null.
Also fix some small issues with converting intents to/from intents.
Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
2014-12-09 20:22:08 -08:00
Andre Eisenbach
e8323934c7
am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
...
* commit 'c91499842fed63c55326e7e2a71b491f7c9315c1':
Prevent NullPointerException in getStringValue if no value is set
2014-12-10 02:36:10 +00:00
Craig Mautner
73bdf9761b
Add put/getBoolean/Array to PersistableBundle
...
Due to popular demand the methods putBoolean(), getBoolean(),
putBooleanArray() and getBooleanArray() have been added to
PersistableBundle.
Fixes bug 18390436.
Change-Id: Id133ba902aca774f98529e36ce560e873b88ad5b
2014-12-09 18:10:20 -08:00
Andre Eisenbach
0fd06a19bd
Prevent NullPointerException in getStringValue if no value is set
...
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
2014-12-09 16:42:14 -08:00
John Reck
3bae94d78e
resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp
...
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
2014-12-09 15:38:38 -08:00
Ruben Brunk
28089cc39b
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033
...
automerge: 6d98265
2014-12-09 23:20:39 +00:00
John Reck
fe11126d23
am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
...
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
Teach AssetAtlas about more drawables
2014-12-09 23:18:08 +00:00
Ruben Brunk
6d9826546d
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
...
automerge: 3ef5033
2014-12-09 23:13:06 +00:00
John Reck
4f1942d999
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
2014-12-09 23:12:42 +00:00
Ruben Brunk
3ef5033cda
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
2014-12-09 23:09:52 +00:00
