OSDN Git Service
Pavlin Radoslavov [Fri, 20 Apr 2018 02:26:19 +0000 (19:26 -0700)]
[automerger skipped] Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev
am:
1c75189a0a -s ours
Change-Id: I6317f4dd82a03daa5ec05844605b84baba72a9bc
TreeHugger Robot [Fri, 20 Apr 2018 02:12:09 +0000 (02:12 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev
Winson Chung [Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
am:
1c0d00fac4
Change-Id: Iaf7247b5134efe7334edfa0d16a56fb8b31af392
Winson Chung [Fri, 20 Apr 2018 01:54:09 +0000 (01:54 +0000)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
Bernie Innocenti [Fri, 20 Apr 2018 01:45:10 +0000 (18:45 -0700)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev
am:
20c294be69
Change-Id: I3b940f5a3b795f85d244882eaa7eca56bd9e167d
Brad Stenning [Fri, 20 Apr 2018 01:38:41 +0000 (18:38 -0700)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev
am:
501889c7d1
Change-Id: I301a2dabdd968e50d6c145ec3208e237329091fb
TreeHugger Robot [Fri, 20 Apr 2018 01:26:49 +0000 (01:26 +0000)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 01:23:05 +0000 (01:23 +0000)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev
Android Build Merger (Role) [Fri, 20 Apr 2018 01:09:56 +0000 (01:09 +0000)]
Merge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9 am:
493dbf789f" into pi-dev-plus-aosp
Pavlin Radoslavov [Fri, 20 Apr 2018 01:08:38 +0000 (18:08 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9
am:
493dbf789f
Change-Id: I5e10a7e35a7befe7d88cd875d7dbcc9b6a7bbb8f
Lucas Dupin [Fri, 20 Apr 2018 01:04:51 +0000 (18:04 -0700)]
Merge "Clock padding and motion adjustments" into pi-dev
am:
96b4b4bd4e
Change-Id: I932fab6fe4d87fc55e3275b2ca0903fd6b34a34f
Pavlin Radoslavov [Fri, 20 Apr 2018 00:59:36 +0000 (17:59 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
am:
3a1ca762c9
Change-Id: I159c2128068021b5ca5e0a7bf3eae218de0bdf1b
Erik Kline [Fri, 20 Apr 2018 00:53:50 +0000 (17:53 -0700)]
[automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
am:
dd08f4b96a -s ours
Change-Id: Id8753d01a14d062baaeb313437b15f03161d1477
Salvador Martinez [Fri, 20 Apr 2018 00:45:51 +0000 (17:45 -0700)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev
am:
c2120a10f7
Change-Id: I06fddba7f72558bdc2b32fb768e550317264dbfe
TreeHugger Robot [Fri, 20 Apr 2018 00:43:53 +0000 (00:43 +0000)]
Merge "Clock padding and motion adjustments" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:39:14 +0000 (00:39 +0000)]
Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
Pavlin Radoslavov [Thu, 19 Apr 2018 21:16:15 +0000 (14:16 -0700)]
Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.
Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.
Bug:
73404858
Bug:
73379307
Test: Unit tests (in frameworks/base)
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java
Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Merged-In: If22087465397b7c4175c33f7d1909a15d957fb24
(cherry picked from commit
9d36e6babc38cf7017726a587b656bdd6f8b0051)
Sanry Huang [Fri, 20 Apr 2018 00:21:11 +0000 (17:21 -0700)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev
am:
f0b7418f1b
Change-Id: I31ed361998a6824a54af7ba27c503263fdcc6e1e
TreeHugger Robot [Fri, 20 Apr 2018 00:15:45 +0000 (00:15 +0000)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev
Jack He [Fri, 20 Apr 2018 00:13:45 +0000 (17:13 -0700)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev
am:
6664f982a7
Change-Id: Id5dfb9bb2176d2117a4b4fb1477bc7e3009ddc2e
Sanry Huang [Fri, 20 Apr 2018 00:03:33 +0000 (00:03 +0000)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev
Treehugger Robot [Thu, 19 Apr 2018 23:55:31 +0000 (23:55 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
Felipe Leme [Thu, 19 Apr 2018 23:55:11 +0000 (16:55 -0700)]
Merge changes from topic "revert_save_info" into pi-dev
am:
4dddd61fa8
Change-Id: Iff89691076a2136bafa1130f97cb71fa1177737d
Amin Shaikh [Thu, 19 Apr 2018 23:49:03 +0000 (16:49 -0700)]
Merge "Update wifi enabled state when connected." into pi-dev
am:
8a87e9ddd8
Change-Id: Iaf5108f48f89406a9c0371fdbc97f5ad81bda559
Amin Shaikh [Thu, 19 Apr 2018 23:44:08 +0000 (16:44 -0700)]
Merge "Allow QS expansion in switch access mode." into pi-dev
am:
caa429eada
Change-Id: I9282dd8321a5fb5c9149d6e4287882ae757e8620
TreeHugger Robot [Thu, 19 Apr 2018 23:37:40 +0000 (23:37 +0000)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:32:46 +0000 (23:32 +0000)]
Merge changes from topic "revert_save_info" into pi-dev
* changes:
Document compatibility mode limitations.
Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
TreeHugger Robot [Thu, 19 Apr 2018 23:30:08 +0000 (23:30 +0000)]
Merge "Update wifi enabled state when connected." into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:29:13 +0000 (23:29 +0000)]
Merge "Allow QS expansion in switch access mode." into pi-dev
Mike Digman [Thu, 19 Apr 2018 22:57:46 +0000 (15:57 -0700)]
Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
am:
0b2f7503a8
Change-Id: I50fad5324559a37634a3f20dd7e40e9927e1feb4
TreeHugger Robot [Thu, 19 Apr 2018 22:32:10 +0000 (22:32 +0000)]
Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
Felipe Leme [Thu, 19 Apr 2018 17:33:20 +0000 (10:33 -0700)]
Document compatibility mode limitations.
Test: mmm -j108 frameworks/base/:doc-comment-check-docs
Fixes:
77655074
Change-Id: I527d882850442c7e6e9379b1b423673885e07f2b
Felipe Leme [Wed, 18 Apr 2018 23:12:04 +0000 (16:12 -0700)]
Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
Save has many limitations on compat mode, so we better not change the SaveInfo
behavior but rather document then.
This reverts commit
4f74a018c8ee9801f1d5ce2c7ec726251efc4fbf.
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest \
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest
Bug:
77655074
Change-Id: I36bd28ca546dcedefe75de7815b76b8b5827aee3
Abodunrinwa Toki [Thu, 19 Apr 2018 22:20:09 +0000 (15:20 -0700)]
Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
am:
993890fbf4
Change-Id: Ie71ca3cc2144b6f700f1e9376fc2f571d3e19ce7
Brad Stenning [Wed, 18 Apr 2018 17:28:24 +0000 (10:28 -0700)]
Allow more than one temp view to be registered at a time
Without this we can't put the status bar above the full screen user
selection page
Bug:
77148007
Test: with a second set of hvac
Change-Id: If422ad4cd2c3ad6ef4beb1d919327fed96184ba6
Stanley Tng [Thu, 19 Apr 2018 22:12:57 +0000 (15:12 -0700)]
Cleanup documentation for LE CoC in BluetoothAdapter
am:
0d5aa574d6
Change-Id: I73a3fd4d9c8dd908ca38f3b9877cafaf7847ff09
Stanley Tng [Thu, 19 Apr 2018 22:09:04 +0000 (15:09 -0700)]
Merge "Clarify API doc for BluetoothGattServer::addService" into pi-dev
am:
fb4da73e76
Change-Id: Ib28fec7dc7ee25de883569c054012a75fd1043f2
Abodunrinwa Toki [Thu, 19 Apr 2018 22:05:17 +0000 (22:05 +0000)]
Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
Jack He [Thu, 19 Apr 2018 22:03:43 +0000 (15:03 -0700)]
AudioService: Add warning log when handleDeviceConnection failed
Bug:
78284878
Test: make, no functional change
Change-Id: I3c0b90afe8f345fa63812a1f91350baccb59516e
Ryan Mitchell [Thu, 19 Apr 2018 21:58:17 +0000 (14:58 -0700)]
Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev
am:
247ecfa498
Change-Id: I507b421d60294ea9262d5be579f22fdc2892c7fe
Stanley Tng [Thu, 5 Apr 2018 01:33:46 +0000 (18:33 -0700)]
Cleanup documentation for LE CoC in BluetoothAdapter
Test: Compile
Bug:
77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
(cherry picked from commit
dac8e140184f3ac52210ff3638af3f53edca1ba0)
Stanley Tng [Thu, 19 Apr 2018 21:56:38 +0000 (21:56 +0000)]
Merge "Clarify API doc for BluetoothGattServer::addService" into pi-dev
Pavlin Radoslavov [Thu, 19 Apr 2018 21:16:15 +0000 (14:16 -0700)]
Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.
Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.
Bug:
73404858
Bug:
73379307
Test: Unit tests (in frameworks/base)
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java
Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Ryan Mitchell [Thu, 19 Apr 2018 21:35:59 +0000 (21:35 +0000)]
Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev
Eugene Susla [Thu, 19 Apr 2018 21:24:07 +0000 (14:24 -0700)]
Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev
am:
bb35e9e0e9
Change-Id: Icd60c59691d8a563a5e47cd56c9b677df708beb9
TreeHugger Robot [Thu, 19 Apr 2018 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev
Android Build Merger (Role) [Thu, 19 Apr 2018 21:07:09 +0000 (21:07 +0000)]
Merge "Merge "Fix channels --stats dump" into pi-dev am:
5de9459c81" into pi-dev-plus-aosp
Julia Reynolds [Thu, 19 Apr 2018 21:06:38 +0000 (14:06 -0700)]
Merge "Fix channels --stats dump" into pi-dev
am:
5de9459c81
Change-Id: I56f1641dbd0f3180fbce8f88b2571be43dcc68a0
Cassie Han [Thu, 19 Apr 2018 21:04:53 +0000 (14:04 -0700)]
[automerger skipped] Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" am:
122a7b33ad
am:
0036df97ca -s ours
Change-Id: Ie27e541ed60edc43f518f041f7200d29612677c5
Winson Chung [Thu, 19 Apr 2018 00:53:15 +0000 (17:53 -0700)]
Workaround to ensure we cancel the recents animation prior to starting home
- It is possible for the call from SystemUI to cancel the recents animation
to be processed and handled after the virtual key has been processed in
PhoneWindowManager. This causes a misordering in which the canceling of
the Recents animation clears the pending start activity remote animation
(which is waiting for app transition ready).
Instead, move the canceling of the Recents animation to PhoneWindowManager
where the nav button is handled, to ensure that we cancel the animation
on the same thread before we start the activity.
Bug:
73188263
Test: Only able to reproduce so far artificially, which points to this
misordering
Change-Id: I1f3477acdf988953a5b3cef2e3b2b402af2d9909
Signed-off-by: Winson Chung <winsonc@google.com>
TreeHugger Robot [Thu, 19 Apr 2018 20:55:49 +0000 (20:55 +0000)]
Merge "Fix channels --stats dump" into pi-dev
Cassie Han [Thu, 19 Apr 2018 20:54:12 +0000 (13:54 -0700)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
am:
122a7b33ad
Change-Id: I5acb34ef6d16fd5eab73951811d220049b60a988
Mike Ma [Thu, 19 Apr 2018 20:29:13 +0000 (13:29 -0700)]
Merge "Fix screen on count text dump" into pi-dev
am:
dd61c7e8e7
Change-Id: Ia2072936a3c02516a4f3add73895ee8e291cdc04
Evan Rosky [Thu, 19 Apr 2018 20:24:41 +0000 (13:24 -0700)]
Merge "Don't crash during layout of non-attached but focused view" into pi-dev
am:
62bb0802f9
Change-Id: I5b091f4fc17586a80934bbea0437323f794d6465
TreeHugger Robot [Thu, 19 Apr 2018 20:16:28 +0000 (20:16 +0000)]
Merge "Fix screen on count text dump" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 20:13:32 +0000 (20:13 +0000)]
Merge "Don't crash during layout of non-attached but focused view" into pi-dev
Julia Reynolds [Thu, 19 Apr 2018 19:50:31 +0000 (15:50 -0400)]
Fix channels --stats dump
Test: manual inspection
Bug:
78292990
Change-Id: Iab75627494213870184e503bc2585cc8644ca1dd
Cassie Han [Thu, 19 Apr 2018 19:23:58 +0000 (19:23 +0000)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
Abodunrinwa Toki [Wed, 18 Apr 2018 20:21:27 +0000 (21:21 +0100)]
Fix non-unique PendingIntent issue with TCImpl.
As per the referenced bug, we're running into issues where apps are
being fired with stale intents. The reason is because we need intents we
fire to be unique by Intent.filterEquals. Some of the intents we
generate put unique data in the intent extra which is not considered by
filterEquals. The solution here is to create PendingIntents with unique
request codes (using classifiedText.hashCode()).
See more info about this in
https://developer.android.com/reference/android/app/PendingIntent.html
Bug:
77930684
Test: manually tested broken scenarios. See referenced bug
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Change-Id: Ib7275f94ca5ada51e4ba191742d4b614df12e1ea
Chong Zhang [Thu, 19 Apr 2018 18:22:34 +0000 (11:22 -0700)]
Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev
am:
3f8884829f
Change-Id: Ib1cc2013127f59af33482c4924faa869b3cb7fb9
Mike Digman [Thu, 19 Apr 2018 17:50:35 +0000 (10:50 -0700)]
Reset sticky navbar timeout when rotate btn shown
First revealing the navbar and then rotating in an
immersive sticky activity makes the rotate navbar button
hard to tap. Signal to the navbar to reset sticky hiding
timeouts if the button becomes visible or changes.
Change-Id: I381bbfd2e0192465b8358bedd213f23dde8ec982
Fixes:
78248328
Test: manual testing with custom immersive sticky activity
Makoto Onuki [Thu, 19 Apr 2018 17:53:38 +0000 (10:53 -0700)]
Merge "SyncManager: Dump per-source last sync time too." into pi-dev
am:
d329ae8010
Change-Id: Ib57bb1dd5433de157d38c86d8054b7821bf05d54
Makoto Onuki [Thu, 19 Apr 2018 17:46:50 +0000 (10:46 -0700)]
Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev
am:
dbdf5df96e
Change-Id: I74e57f9cd0fc051f4308df48535f3dce22f3908b
TreeHugger Robot [Thu, 19 Apr 2018 17:40:39 +0000 (17:40 +0000)]
Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev
Makoto Onuki [Thu, 19 Apr 2018 17:37:45 +0000 (17:37 +0000)]
Merge "SyncManager: Dump per-source last sync time too." into pi-dev
Beverly [Thu, 19 Apr 2018 17:29:23 +0000 (10:29 -0700)]
Merge "Update notification shade text on zen change" into pi-dev
am:
7468d361e3
Change-Id: I486f4d5500e01570255af814bf53cf5e42ca9c06
Makoto Onuki [Thu, 19 Apr 2018 17:21:48 +0000 (17:21 +0000)]
Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev
Amin Shaikh [Tue, 17 Apr 2018 15:14:32 +0000 (11:14 -0400)]
Allow QS expansion in switch access mode.
Change-Id: I90ffc96f3bbbc8e5cad1509cc8d7b4028ff3fe04
Fixes:
78129194
Test: manually
TreeHugger Robot [Thu, 19 Apr 2018 17:11:25 +0000 (17:11 +0000)]
Merge "Update notification shade text on zen change" into pi-dev
Lucas Dupin [Thu, 12 Apr 2018 17:50:13 +0000 (10:50 -0700)]
Clock padding and motion adjustments
Fixes:
73830624
Test: manual
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/PropertyAnimatorTest.java
Change-Id: I9b7785cfbc610db9e4b920eef518ab24b97a6bbc
Tony Mak [Thu, 19 Apr 2018 17:03:59 +0000 (10:03 -0700)]
Merge "getUserIdLPr should take application id as input" into pi-dev
am:
79ecaac7f3
Change-Id: I2ecaa5a9505140548acacd3ab79be1a63bd19edd
TreeHugger Robot [Thu, 19 Apr 2018 16:51:23 +0000 (16:51 +0000)]
Merge "getUserIdLPr should take application id as input" into pi-dev
Amin Shaikh [Thu, 19 Apr 2018 16:49:09 +0000 (09:49 -0700)]
Merge "Update bluetooth QS tile secondary text." into pi-dev
am:
db082f5252
Change-Id: I434216762acacd71c96aec4e6c1b76d8441618e1
Mathew Inwood [Thu, 19 Apr 2018 16:43:15 +0000 (09:43 -0700)]
Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
am:
611443e984
Change-Id: I2ead19c8fda255d010aded3884aef0016e1cc74d
Beverly Tai [Thu, 19 Apr 2018 16:29:53 +0000 (09:29 -0700)]
Merge "Don't mute ringer if apps can bypass dnd" into pi-dev
am:
39997ea603
Change-Id: Ie8bb9617d8439fdcf739f9fe5264aaa5d0421d72
TreeHugger Robot [Thu, 19 Apr 2018 16:29:52 +0000 (16:29 +0000)]
Merge "Update bluetooth QS tile secondary text." into pi-dev
Mathew Inwood [Thu, 19 Apr 2018 16:24:31 +0000 (16:24 +0000)]
Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
jiabin [Thu, 19 Apr 2018 16:23:27 +0000 (09:23 -0700)]
Merge "Add setMin for all slider in volume panel." into pi-dev
am:
67332c7397
Change-Id: Ieb1729a5575c9f544a7c4db7c658400b2305e60c
Dan Sandler [Thu, 19 Apr 2018 16:12:56 +0000 (09:12 -0700)]
Merge "Clean up punctuation in SIM locked strings." into pi-dev
am:
8375834cc8
Change-Id: I69ed6b40698c28dd0a3d806f80e0af947949e25f
Beverly Tai [Thu, 19 Apr 2018 16:08:28 +0000 (16:08 +0000)]
Merge "Don't mute ringer if apps can bypass dnd" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 16:07:12 +0000 (16:07 +0000)]
Merge "Add setMin for all slider in volume panel." into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 16:00:35 +0000 (16:00 +0000)]
Merge "Clean up punctuation in SIM locked strings." into pi-dev
Evan Laird [Thu, 19 Apr 2018 15:57:19 +0000 (08:57 -0700)]
Merge "Status bar icon ordering" into pi-dev
am:
c1adfac496
Change-Id: Id72779dc5e54b9175cacdf0c6fe0342afcb3ffbe
Beverly [Thu, 19 Apr 2018 15:47:51 +0000 (08:47 -0700)]
Merge "Translate SystemUi NotifChannels on locale change" into pi-dev
am:
39e2366d4a
Change-Id: I90c1b6c29af869eb7cb27e74300277162e77410a
TreeHugger Robot [Thu, 19 Apr 2018 15:47:38 +0000 (15:47 +0000)]
Merge "Status bar icon ordering" into pi-dev
Anton Hansson [Thu, 19 Apr 2018 15:42:56 +0000 (08:42 -0700)]
Merge "Update docs 'since' for API 28." into pi-dev
am:
93f457c531
Change-Id: I86d0f88190fa9603ac3eef6468a73d32c1a633e3
TreeHugger Robot [Thu, 19 Apr 2018 15:32:45 +0000 (15:32 +0000)]
Merge "Translate SystemUi NotifChannels on locale change" into pi-dev
Anton Hansson [Thu, 19 Apr 2018 15:30:07 +0000 (15:30 +0000)]
Merge "Update docs 'since' for API 28." into pi-dev
Jorim Jaggi [Thu, 19 Apr 2018 15:28:16 +0000 (08:28 -0700)]
Merge "Revert "Don't consider resources < 0 as invalid"" into pi-dev
am:
2557f34102
Change-Id: Iff2cbb469b137cbc7cbb258d001d3330451f2221
Bernie Innocenti [Thu, 19 Apr 2018 15:23:07 +0000 (08:23 -0700)]
Merge "Adjust APF interpreter tests to match APFv4" am:
05011abf27
am:
e56afce9e9
Change-Id: Iac5a843c1476dd96029956bba7e68aed538d0c52
Amin Shaikh [Wed, 18 Apr 2018 21:43:53 +0000 (17:43 -0400)]
Update wifi enabled state when connected.
Change-Id: Ib0be6b3ab8139781868781c370688d70cef22553
Fixes:
78242165
Test: runtest systemui
Jorim Jaggi [Thu, 19 Apr 2018 15:18:23 +0000 (15:18 +0000)]
Merge "Revert "Don't consider resources < 0 as invalid"" into pi-dev
Jeff Sharkey [Thu, 19 Apr 2018 15:09:24 +0000 (08:09 -0700)]
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
am:
1cd96854d4
Change-Id: Ie979847bd41777cef2b4169cb7f78abe174d054d
Jeff Sharkey [Thu, 19 Apr 2018 14:58:02 +0000 (14:58 +0000)]
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
Beverly [Wed, 18 Apr 2018 21:32:56 +0000 (17:32 -0400)]
Update notification shade text on zen change
Change-Id: I6b75af1a94f7da95ac78fac122651924db7c1308
Fixes:
76143428
Test: NotificationStackScrollLayoutTest
Dan Sandler [Sat, 14 Apr 2018 00:39:39 +0000 (20:39 -0400)]
Clean up punctuation in SIM locked strings.
Bug:
76122305
Test: visual
Change-Id: I4795b10fee950fd37efc0bd95af87cb14d0947ff
Beverly [Thu, 19 Apr 2018 14:27:06 +0000 (10:27 -0400)]
Translate SystemUi NotifChannels on locale change
Register receiver outside of the on boot receiver
Test: manual
Change-Id: Id286647ffe68704f928ca55dcae14dadc4fa998d
Fixes:
64887866
Bernie Innocenti [Thu, 19 Apr 2018 14:25:11 +0000 (07:25 -0700)]
Merge "Adjust APF interpreter tests to match APFv4"
am:
05011abf27
Change-Id: I5ca2b41ab6c101bef7465229270079c81743c757
Adrian Roos [Thu, 19 Apr 2018 14:10:52 +0000 (07:10 -0700)]
Merge "AOD: Ensure WakeLock is held for delayed dozeTimeTick" into pi-dev
am:
4fca6d6b31
Change-Id: I6664456dd641d9e1abb2fe9d65841fadb2299f37
TreeHugger Robot [Thu, 19 Apr 2018 13:59:25 +0000 (13:59 +0000)]
Merge "AOD: Ensure WakeLock is held for delayed dozeTimeTick" into pi-dev