130817 Commits

Author SHA1 Message Date
bulic
5ae2afdc2a Merge "Prevent home task from being set as ontopofhome" 2014-05-13 00:02:01 +00:00
Robert Greenwalt
f9cb86aebe Replace LinkCapabilities with NetworkCapabilities
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
2014-05-12 16:52:56 -07:00
Robert Greenwalt
6681e32fff Merge "Add NetworkCapabilities part of API." 2014-05-12 23:32:03 +00:00
Alan Viverette
2feaa1837a Merge "Simplify accessibility display adjustments" 2014-05-12 23:05:48 +00:00
Alan Viverette
2b477f2c44 Merge "Simplify accessibility display adjustments in Quick Settings" 2014-05-12 23:05:33 +00:00
Matthew Williams
30d9badeab Merge "First implementation of the TaskManager internals." 2014-05-12 22:47:30 +00:00
ztenghui
b7869fb3ff Merge "Remove the group tag." 2014-05-12 22:41:43 +00:00
Matthew Williams
6de79e2b17 First implementation of the TaskManager internals.
Sketching out the TaskManagerService, and provide an implementation
of the Connectivity & Time controllers to use as a basis for how the
IdleMode controller will function.

Change-Id: I9163b8b9df1f8a027354720b469a0fb4c8e37194
2014-05-12 15:41:43 -07:00
Etienne Le Grand
1796635f7f Merge "Add wake gesture as a hidden sensor in Sensor.java" 2014-05-12 22:41:19 +00:00
Alan Viverette
e08340645d Simplify accessibility display adjustments
Makes the inversion bit public so apps can be smarter about rendering
images non-inverted (if they are so inclined).

BUG: 14680114
Change-Id: I8ca2b2517af2ffc13446d7e0b4e859c1171e2d0e
2014-05-12 15:26:45 -07:00
Alan Viverette
cfd9d7eec2 Simplify accessibility display adjustments in Quick Settings
BUG: 14680114
Change-Id: Ie79aabda8ddf8cd47a556b1b11f6c9e717f99649
2014-05-12 15:26:23 -07:00
John Reck
cae6873161 Merge "Add TimeInterpolator support to RNA" 2014-05-12 22:11:00 +00:00
John Reck
315c329544 Add TimeInterpolator support to RNA
Bug: 14678626

Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
2014-05-12 14:41:06 -07:00
bulic
ccd230712d Prevent home task from being set as ontopofhome
If the front activity of a task that is on top of home finishes, the oldest task in
other stacks will be set as ontopofhome (which in this case meant the
home task was set to ontopofhome).  The solution is to ensure we
only set a task to ontopofhome if the finishing activity is in the same
stack.

Change-Id: Idd8f9af4d3d9bd2de3c519d3dcc60f479695ae0c
2014-05-12 14:34:50 -07:00
Ruchi Kandoi
0e8a427ab8 Merge "PowerManager: Minor Coding style issues." 2014-05-12 21:25:13 +00:00
RoboErik
f33e99828f Merge "Make sessions aware of user id" 2014-05-12 21:20:49 +00:00
Ruchi Kandoi
15aedf5bfc PowerManager: Minor Coding style issues.
Corrects coding style errors caused by
Ibed319e734340dfd5348dbeb8fe20c01b1adaac5

Change-Id: I81eb0a2bcc4fb45804a1f47aef76d94142f6aba7
2014-05-12 21:16:39 +00:00
Chris Wren
9bbc0ca0ab Merge "notification ranking infrastructure" 2014-05-12 20:48:44 +00:00
Simon Wilson
da86f784b6 am 728614e4: am c5df4d0e: Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" into klp-modular-dev
* commit '728614e42e70bec63f7e95ab4f97a4aa2518e234':
  BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
2014-05-12 19:53:06 +00:00
Simon Wilson
728614e42e am c5df4d0e: Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" into klp-modular-dev
* commit 'c5df4d0e7d43d39072dfbab5f37d8b170de4617b':
  BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
2014-05-12 19:49:00 +00:00
Simon Wilson
c5df4d0e7d Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" into klp-modular-dev 2014-05-12 19:45:35 +00:00
Selim Cinek
bea8b51e18 Merge "Improved stack scroll range logic and more card background bug" 2014-05-12 19:32:28 +00:00
Selim Cinek
a5eaa6034d Improved stack scroll range logic and more card background bug
Change-Id: Id3e6dfc4de09c6853ea1973b287880ac5f32b40b
2014-05-12 21:31:34 +02:00
Jorim Jaggi
28f5225443 Merge "Fix clipping and outline for top quick settings header." 2014-05-12 19:14:12 +00:00
Robert Greenwalt
1448f0540b Add NetworkCapabilities part of API.
Merging to master, adding @hide until we're ready to reveal the API change.

bug:13885501
Change-Id: Ib40e28092e092630bfec557bde77f58eec8ae1c8
2014-05-12 12:12:57 -07:00
Jorim Jaggi
db3e6ed427 Fix clipping and outline for top quick settings header.
Change-Id: I4b4d093d4c6abe120fc166b75e1bd96446027794
2014-05-12 21:10:54 +02:00
Tim Kilbourn
e1071df959 am 82c93357: (-s ours) am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev
* commit '82c93357d0b61a6e12dcfc5eee1101968b8cba22':
  DO NOT MERGE Hide more leanback stuff.
2014-05-12 18:49:48 +00:00
Tim Kilbourn
b3fbc56caa am 0ff8f796: (-s ours) am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
* commit '0ff8f796d968a45d26038e3a08ba9785f985a1ec':
  DO NOT MERGE Hide leanback packagemanager apis.
2014-05-12 18:49:44 +00:00
Tim Kilbourn
82c93357d0 am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev
* commit '05c581ac4d6f44263891eae94a41a3841634d89c':
  DO NOT MERGE Hide more leanback stuff.
2014-05-12 18:43:41 +00:00
Tim Kilbourn
0ff8f796d9 am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
* commit 'd6fc5115a656f9d06dd1d455f8bedd5f5eca943b':
  DO NOT MERGE Hide leanback packagemanager apis.
2014-05-12 18:43:37 +00:00
Yorke Lee
3c13d685ba Merge "Fix magnitude of AbsListView nested scrolling offset" 2014-05-12 18:41:13 +00:00
Tim Kilbourn
05c581ac4d Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev 2014-05-12 18:41:11 +00:00
Tim Kilbourn
d6fc5115a6 Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev 2014-05-12 18:39:45 +00:00
Jorim Jaggi
1218c3134c Merge "Directly start to collapse QS when overscrolling." 2014-05-12 18:30:27 +00:00
Jorim Jaggi
fc1a824ec1 Directly start to collapse QS when overscrolling.
Change-Id: I33ec42fd0fe7344c269e31e9798e036e8a0532a0
2014-05-12 20:28:28 +02:00
Robert Greenwalt
82f421ad83 Merge "First pass on multinetwork framework" 2014-05-12 18:19:55 +00:00
Yorke Lee
e2e19391d4 Fix magnitude of AbsListView nested scrolling offset
Change-Id: I9402fd4b788c9e93163974fbd4d89c200fe49581
2014-05-12 11:14:12 -07:00
Adam Lesinski
f000977620 Merge "Add support for building split APKs" 2014-05-12 18:12:35 +00:00
Robert Greenwalt
9ba9c58e4a First pass on multinetwork framework
Starting to switch netd to use NetId.
Adding the Network identifying class

bug:13550136
Change-Id: Ie0db4fb17c9300bfafb63329adfa02339911b33d
2014-05-12 10:59:44 -07:00
Alan Viverette
1cb088c128 Merge "Support for hollow switch and seek bar thumbs" 2014-05-12 17:56:57 +00:00
Alan Viverette
661e63658d Support for hollow switch and seek bar thumbs
Also cleans up AbsSeekBar.

Change-Id: I996ea90c732c1da6a801aad3079f6bb3692d5c67
2014-05-12 10:55:37 -07:00
ztenghui
46e546c28f Remove the group tag.
Since we don't support animation, it is better not to expose the group tag for now,
which will only lead to confusion.
Internally, we keep the group class to represent multiple paths. But we don't
allow multiple groups.

Change-Id: I041ba32dff05ef6b1cd9d5ab1a1717e55a356145
2014-05-12 10:54:11 -07:00
Yorke Lee
033655636e Merge "Fix nested scrolling bugs in AbsListView" 2014-05-12 17:53:51 +00:00
Yorke Lee
43943d8bbc Fix nested scrolling bugs in AbsListView
* rawDeltaY should be offset by mMotionCorrection when passing it
to dispatchNestedPreScroll
* mScrollOffset should offset the next motion event, not the current
one

Bug: 14572732

Change-Id: Ib98f27d608b91706af4537e1cf9ad42adce121ea
2014-05-12 10:48:25 -07:00
Jean-Michel Trivi
bdad5cb124 Merge "Define audio attributes" 2014-05-12 17:47:20 +00:00
Robert Greenwalt
140d2d3e6b Merge "Support multiple calls to AsyncChannel.disconnect" 2014-05-12 17:28:59 +00:00
Jean-Michel Trivi
d60e875a97 Define audio attributes
AudioAttributes is a class to associate a collection of attributes
  describing information about an audio player.

Change-Id: I031aca1c79353abdfa0d7272c5dee0c2376c519a
2014-05-12 09:54:51 -07:00
Robert Greenwalt
e4f1960652 Merge "Turn down the logging." 2014-05-12 16:39:37 +00:00
Robert Greenwalt
b7fbb9b691 Support multiple calls to AsyncChannel.disconnect
prior to this you'd get a crash if you called it twice.

Change-Id: Ie066b1e00970e17b2ebab5c51a57a9a3459aee26
2014-05-12 09:12:56 -07:00
Robert Greenwalt
7f44ff8d6b Turn down the logging.
Cut per-msg logging by 1/3 in NDC so we see that much more.

Change-Id: I406297d98f2649a88b16c7be3cf90757d009c762
2014-05-12 08:59:27 -07:00