267280 Commits

Author SHA1 Message Date
Adrian Roos
c5d9eb8ebd NavBar: Use rotation watcher
am: a98b32cea2

Change-Id: Ia820decbca2535b85ac1bf366bd789ab51be4d73
2016-08-17 17:15:34 +00:00
Tyler Gunn
464eb12320 Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev
am: 76c973cda0

Change-Id: I3f3fd27441b3c5b371fb32c3f0837c9466ac0530
2016-08-17 17:15:28 +00:00
Tyler Gunn
6c678716e4 Support auto-downgrade to audio when data disabled.
am: 86d5c3fcde

Change-Id: Iecf7d4e33bac40d630f5438e297f9fc20bb888f0
2016-08-17 17:14:45 +00:00
Sriram Viswanathan
8f7f6abd09 Merge "Replace android auto assets with the latest" into nyc-mr1-dev
am: 91ef993e2d

Change-Id: I7d992d83ebd185c1e67ecd24c3d5fd30e4c87fb8
2016-08-17 17:14:29 +00:00
Sriram Viswanathan
a7ad4e2e45 Replace android auto assets with the latest
am: e45311adc9

Change-Id: Ied7a5adcceda1efba66e91d97a835c7ccf870f4d
2016-08-17 17:14:27 +00:00
John Reck
08669fff33 Fix maps resume being blank
am: 03df0834e6

Change-Id: Iad93e1b11e74acf2356d59c271892d6741b53fef
2016-08-17 17:14:23 +00:00
Bill Yi
d165fa2027 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 60ab8d072a  -s ours

Change-Id: I35ebad1911c8d548f3918026be446075a471d1c8
2016-08-17 17:14:20 +00:00
Bill Yi
217addf432 Import translations. DO NOT MERGE
am: ad0dfea172  -s ours

Change-Id: I68667b5fd3777621b425093da0b64106f6dfc09c
2016-08-17 17:14:18 +00:00
Bill Yi
c182b0067e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 48d01fde6b  -s ours

Change-Id: Id88552a95441037ef5825a81311a95b9dd66ac73
2016-08-17 17:14:15 +00:00
Bill Yi
5b0b9696bb Import translations. DO NOT MERGE
am: 28753c7c4a  -s ours

Change-Id: Ie2d08b1e339982bc8606ff4ecf58487604220bfe
2016-08-17 17:14:13 +00:00
Eric Schmidt
c89c8c3e37 docs: Fixed code snippet in notify-user/navigation.html
am: 32cc6b7fb7

Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
2016-08-17 17:14:11 +00:00
Tobias Thierer
7f5095ddfe Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 778321361132672ea1174e4ca3f5397477c32690.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
2016-08-17 17:11:01 +00:00
Phil Burk
441d3b66ce Merge "UsbMidiDevice: fix MIDI flush()" am: c5b376ab66 am: 86fbbfb6f0
am: 4317410c40

Change-Id: I763d30fa9a94c23a26315cad7ebac9aeb7f78c73
2016-08-17 17:09:14 +00:00
Tobias Thierer
9354783343 Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2 am: 17fea8b967
am: 8fc0ac9b39

Change-Id: Ia814e0be0e66022a373c8a8e4bc27a71ce85d866
2016-08-17 17:09:11 +00:00
Phil Burk
4317410c40 Merge "UsbMidiDevice: fix MIDI flush()" am: c5b376ab66
am: 86fbbfb6f0

Change-Id: I938d0365abffe9cb05a7c10d80562e3742290853
2016-08-17 17:03:47 +00:00
Tobias Thierer
8fc0ac9b39 Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2
am: 17fea8b967

Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
2016-08-17 17:03:44 +00:00
Tobias Thierer
be97d6c1ff Revert "Track libcore update of Map classes to jdk8u60" am: 7783213611
am: 5efe2b7515

Change-Id: Ic9386c17ec28b68de3127057eafbc60399e44f47
2016-08-17 17:00:13 +00:00
Tobias Thierer
70f8050b48 Track libcore update of Map classes to jdk8u60 am: fb2ade3dca
am: eb4eeb5323

Change-Id: I97ae4e7346424b6c58bc15f3682293d2854db23c
2016-08-17 17:00:09 +00:00
Phil Burk
86fbbfb6f0 Merge "UsbMidiDevice: fix MIDI flush()"
am: c5b376ab66

Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868
2016-08-17 16:59:06 +00:00
Tobias Thierer
17fea8b967 Merge "Track libcore update of Map classes to jdk8u60."
am: ec6a323da2

Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
2016-08-17 16:54:30 +00:00
Tobias Thierer
5efe2b7515 Revert "Track libcore update of Map classes to jdk8u60"
am: 7783213611

Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
2016-08-17 16:54:08 +00:00
Tobias Thierer
eb4eeb5323 Track libcore update of Map classes to jdk8u60
am: fb2ade3dca

Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
2016-08-17 16:54:05 +00:00
Tobias Thierer
7783213611 Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.

Bug: 30911913

This reverts commit fb2ade3dcab0962f18acab720875c75622f412ed.

Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
2016-08-17 14:59:28 +00:00
Treehugger Robot
c5b376ab66 Merge "UsbMidiDevice: fix MIDI flush()" 2016-08-17 13:57:33 +00:00
Tobias Thierer
fb2ade3dca Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640

This CL requires base CLs, which will get merged from aosp-master,
in order to build.

Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
2016-08-17 11:06:27 +01:00
Tobias Thierer
ec6a323da2 Merge "Track libcore update of Map classes to jdk8u60." 2016-08-17 10:03:53 +00:00
Erik Kline
1f4278a67a Better error handling when NetworkManagementService#untetherInterface() fails.
Additionally, catch ServiceSpecificException when making netd binder calls.

Test:
  Flipped back and forth between USB and wifi tethering and no longer
  some of the unrecoverable errors.

Bug: 30882741
Change-Id: I470b7cfdaaa82013db35b500a5df10dcfaad2d8c
2016-08-17 12:52:38 +09:00
TreeHugger Robot
69115b8e29 Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev 2016-08-17 01:46:53 +00:00
Erik Kline
caf7d3f447 Merge "Support tethering IPv6 toward the first requested downstream." into nyc-mr1-dev 2016-08-17 00:43:37 +00:00
Doris Liu
853b23d1fa Fix listeners not getting called when AVD falls back on UI thread
When AVD fall back on UI thread, in addition to transfer the pending
actions from RT animator to UI animator, we also need to transfer
the listener, if any.

BUG: 30901495
Change-Id: Ib4a7ebb2996a02596bb5789704617c894a5dd474
2016-08-17 00:20:39 +00:00
Phil Burk
2f2bf4014a UsbMidiDevice: fix MIDI flush()
The proxy MidiReceiver in the USB device was not forwarding the flush
command to the event scheduler.

Bug: 25511696
Change-Id: I6a4759b71bc8f9ae3e20aed1238f62a2ed405e24
Signed-off-by: Phil Burk <philburk@google.com>
2016-08-16 16:57:36 -07:00
TreeHugger Robot
f1e87a2003 Merge "Allow configurable data warning for BillingCyclerPreference" into nyc-mr1-dev 2016-08-16 23:51:04 +00:00
Brad Ebinger
fb599587a1 Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev 2016-08-16 23:39:47 +00:00
TreeHugger Robot
a9663254ac Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev 2016-08-16 23:28:22 +00:00
Glenn Kasten
46db227b84 Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev 2016-08-16 22:51:58 +00:00
Selim Cinek
a9d3efd194 Fixed the animation of the no notifications view
The view was also animating when the shade wasn't expanded.

Change-Id: If235db60230525dda17c5df0681beec2ab01a79e
Fixes: 30880548
2016-08-16 21:46:47 +00:00
Fan Zhang
70196d84a6 Allow configurable data warning for BillingCyclerPreference
Bug: 30898071
Change-Id: Ifb822828c5e7152e4ca217593f7746bfbb29ab2a
2016-08-16 14:16:12 -07:00
Brad Ebinger
5ea6b1ece9 Adds a CNAP filtering field to the CarrierConfig
Adds the ability for the CarrierConfig to provide a list of CNAP names
that will be filtered out to the user. These names are usually generic
names that do not provide any useful caller ID information, such as
"WIRELESS CALLER".

Bug: 30142293
Change-Id: I8a99975380f99d160c2af6f6fa4b5ca3ebca1d3c
2016-08-16 13:39:55 -07:00
Chong Zhang
f925b8df92 Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev 2016-08-16 19:49:29 +00:00
Phil Weaver
49b684d562 Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev 2016-08-16 19:33:28 +00:00
Andrew Solovay
085994c40d docs: Docs for Support Library 24.2.0 release
Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.

Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.

See first comment for doc stage location.

bug: 30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724
2016-08-16 12:29:30 -07:00
TreeHugger Robot
e68228fbd9 Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev 2016-08-16 18:36:25 +00:00
Adrian Roos
27c3c34fe1 Merge "NavBar: Use rotation watcher" into nyc-mr1-dev 2016-08-16 18:32:29 +00:00
Tyler Gunn
76c973cda0 Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev 2016-08-16 18:32:14 +00:00
Sriram Viswanathan
91ef993e2d Merge "Replace android auto assets with the latest" into nyc-mr1-dev 2016-08-16 18:20:11 +00:00
Michael Kwan
dc0735676b Merge "Hide space for title if the title is GONE." into cw-f-dev 2016-08-16 17:56:42 +00:00
Bill Yi
ab2c244135 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-08-16 17:40:35 +00:00
Bill Yi
4bdc6b6c9f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-08-16 17:40:12 +00:00
Selim Cinek
80c44dd800 Fixed a bug where the summary could become visible even if it was suppressed
Because the updating of the suppression was prohibited, some groups could loose
their suppression state when they were heads upped. This would lead to duplicate
notifications. We're now still allowing the state to be properly modified instead
but don't notify listeners anymore since that was only an internal update.

Change-Id: I6ae96ea8cfab00ef6bdb1ef047f8b77ea88e8206
Fixes: 30608517
2016-08-16 17:19:14 +00:00
Eric Schmidt
32cc6b7fb7 docs: Fixed code snippet in notify-user/navigation.html
Bug: 25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
2016-08-16 10:10:49 -07:00