OSDN Git Service
Hall Liu [Wed, 30 May 2018 22:28:18 +0000 (15:28 -0700)]
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am:
39ac9ffe27
am:
f06c6d0187 -s ours
Change-Id: Ic6ae00ffdf13aff3b3c081c2b00cefbfa1412d6f
Chenbo Feng [Wed, 30 May 2018 22:17:21 +0000 (15:17 -0700)]
[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am:
0defa6e72c
am:
8196301e24 -s ours
Change-Id: I4b8e1669b80040287dd96423e8384e189db4af2d
Matthew Ng [Wed, 30 May 2018 22:10:41 +0000 (15:10 -0700)]
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev
am:
d2de50b995
Change-Id: I8dbe77b963e0f6547c33ea1363c4c940eaf27fd8
Hall Liu [Wed, 30 May 2018 22:09:21 +0000 (15:09 -0700)]
Merge "Add CallAudioState ctor as TestApi"
am:
39ac9ffe27
Change-Id: I7ecc3c81927b58bddb5ae12f254be0c09133672a
Chenbo Feng [Wed, 30 May 2018 22:05:08 +0000 (15:05 -0700)]
Merge "Check for bpf support at NetworkStatsService start"
am:
0defa6e72c
Change-Id: Ia2b5c8c7b7185787fee57281727b366752ef887f
Evan Rosky [Wed, 30 May 2018 22:02:51 +0000 (15:02 -0700)]
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev
am:
7ba4c2b254
Change-Id: Ia7fab42d36c8b58b05656cc2e5d1253449becf96
TreeHugger Robot [Wed, 30 May 2018 21:55:54 +0000 (21:55 +0000)]
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev
Evan Rosky [Wed, 30 May 2018 21:47:25 +0000 (21:47 +0000)]
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev
Selim Cinek [Wed, 30 May 2018 20:52:22 +0000 (13:52 -0700)]
Merge "Fixed an issue where group children had rounded corners" into pi-dev
am:
f04b6c8d77
Change-Id: I0c6aacd977ab50acac2b69b9ea86d4039c512987
TreeHugger Robot [Wed, 30 May 2018 20:26:45 +0000 (20:26 +0000)]
Merge "Fixed an issue where group children had rounded corners" into pi-dev
Hall Liu [Wed, 30 May 2018 20:24:34 +0000 (20:24 +0000)]
Merge "Add CallAudioState ctor as TestApi"
Treehugger Robot [Wed, 30 May 2018 19:54:42 +0000 (19:54 +0000)]
Merge "Check for bpf support at NetworkStatsService start"
Matthew Ng [Wed, 30 May 2018 18:27:39 +0000 (11:27 -0700)]
Show back button when launcher is disconnected from proxy service
Whenever service is disconnected, the back button will be shown. Once
the service is connected, launcher will decide whether or not to hide
the back button.
Test: adb shell am force-stop com.google.android.apps.nexuslauncher
Change-Id: Ic947e51c00abd9591c800aa1023b8d9684dc5d93
Fixes:
80098608
Chenbo Feng [Sat, 19 May 2018 00:10:07 +0000 (17:10 -0700)]
Check for bpf support at NetworkStatsService start
The current implementation check for bpf map existance whenever a
NetworkStats request comes in. The check is not efficient and may
require additional permission for threads. So a member variable is added
to NetworkStatsService to store the bpf configuration status and is
initialized when NetworkStatsService start.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
-m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
79994577
Change-Id: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Merged-In: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Robert Shih [Wed, 30 May 2018 18:13:45 +0000 (11:13 -0700)]
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
am:
e3348a2593
Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c
Robert Shih [Wed, 30 May 2018 17:43:58 +0000 (17:43 +0000)]
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
Selim Cinek [Wed, 30 May 2018 16:55:36 +0000 (09:55 -0700)]
Fixed an issue where group children had rounded corners
Children that were close to the clipping boundary before
were not being reset when they were added as a child.
This could happen with auto groups when collapsed or
with heads up notifications.
Change-Id: I873b65da6778840c4542b4324f69d2ec9b5c1dc5
Fixes:
80276391
Test: add autobundleable children while collapsed, observe no corners
Andrii Kulian [Wed, 30 May 2018 15:29:00 +0000 (08:29 -0700)]
Merge changes from topic "rotation_config_update_fixes" into pi-dev
am:
e81a27f4aa
Change-Id: I0cdb6e265d5b8c690e4115d39a86344b81dd956f
Andrii Kulian [Wed, 30 May 2018 15:23:13 +0000 (08:23 -0700)]
Update visibility and config at the same time
am:
f4479eef64
Change-Id: Ia16c263532bf8018b10f6dffdbc7b52d366babab
Andrii Kulian [Wed, 30 May 2018 15:17:24 +0000 (08:17 -0700)]
Don't update configuration for invisible windows
am:
3dcdf64cf6
Change-Id: Ia64347043165aabfd663ed9d2cdefc7c42795957
Andrii Kulian [Wed, 30 May 2018 15:10:31 +0000 (08:10 -0700)]
Don't let top activity to influence the orientation
am:
0918d3674f
Change-Id: Ib75b8859f6bfbb034c1cd74f5f21cbae73da17c9
Andrii Kulian [Wed, 30 May 2018 14:50:18 +0000 (14:50 +0000)]
Merge changes from topic "rotation_config_update_fixes" into pi-dev
* changes:
Force-update the orientation of before sending to client
Update visibility and config at the same time
Don't update configuration for invisible windows
Don't let top activity to influence the orientation
Tyler Gunn [Wed, 30 May 2018 14:37:35 +0000 (07:37 -0700)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev
am:
5025812860
Change-Id: Id84d7761db866905a8c6850beca302f17674ba5f
Tyler Gunn [Wed, 30 May 2018 14:24:23 +0000 (14:24 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev
Nicolas Geoffray [Wed, 30 May 2018 11:57:41 +0000 (04:57 -0700)]
Merge "More greylisted APIs." into pi-dev
am:
6d71fa791b
Change-Id: I343e80b48ce03daff53b3150f02463f8139d0662
Nicolas Geoffray [Wed, 30 May 2018 11:45:46 +0000 (11:45 +0000)]
Merge "More greylisted APIs." into pi-dev
Nicolas Geoffray [Wed, 30 May 2018 09:51:48 +0000 (10:51 +0100)]
More greylisted APIs.
bug:
80447248
bug:
80444865
bug:
80441306
bug:
80441307
bug:
80440630
Test: m
Change-Id: I8be93884ad770f885fed1afb3864ea5322902bb1
Michael Wright [Wed, 30 May 2018 09:38:47 +0000 (02:38 -0700)]
Merge "Allow for any default vibration intensity level." into pi-dev
am:
fb840c9170
Change-Id: Ia1df028a9a0011f47ef2de6ec50e64c227c4b418
Michael Wright [Wed, 30 May 2018 09:28:22 +0000 (09:28 +0000)]
Merge "Allow for any default vibration intensity level." into pi-dev
Colin Cross [Wed, 30 May 2018 06:31:12 +0000 (23:31 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors" am:
ce1979d707
am:
da6fcd1f9a
Change-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8
Colin Cross [Wed, 30 May 2018 06:21:55 +0000 (23:21 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors"
am:
ce1979d707
Change-Id: If52a42d9f2a95d5d957b177e36a7a14fd54bace9
Lucas Dupin [Wed, 30 May 2018 05:21:31 +0000 (22:21 -0700)]
Merge "Cancel dark animation when new one arrives" into pi-dev
am:
7c0e462b20
Change-Id: I055e40a9ce8aed257f14efd77677031a6656a034
TreeHugger Robot [Wed, 30 May 2018 05:14:35 +0000 (05:14 +0000)]
Merge "Cancel dark animation when new one arrives" into pi-dev
Colin Cross [Wed, 30 May 2018 05:01:08 +0000 (05:01 +0000)]
Merge "Use AAPT2 for more modules with manifest validation errors"
Tracy Zhou [Wed, 30 May 2018 04:44:31 +0000 (21:44 -0700)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
am:
5a0c1e1101
Change-Id: I5544c8b5e7b79a9b8002be53a04cf0af48c7f050
Sungsoo Lim [Wed, 30 May 2018 04:39:47 +0000 (21:39 -0700)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
am:
babf190396
Change-Id: I7b4dba8612a8e58172d210f6f0764079cfc98af1
TreeHugger Robot [Wed, 30 May 2018 04:30:49 +0000 (04:30 +0000)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 03:26:22 +0000 (03:26 +0000)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
Fan Zhang [Wed, 30 May 2018 03:20:08 +0000 (20:20 -0700)]
Merge "Add default phone/sms to battery whitelist apps." into pi-dev
am:
89722d829e
Change-Id: Ide1af36c0e0b70d93cca44a4193f7e2a242d2de5
Jakub Pawlowski [Wed, 30 May 2018 03:14:57 +0000 (20:14 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84 am:
bc45dc9536 -s ours am:
2d6209f71d -s ours
am:
e6cbbd4994 -s ours
Change-Id: I0cebfeee832964a286c6b31873368dbf90a8a6f6
TreeHugger Robot [Wed, 30 May 2018 03:08:19 +0000 (03:08 +0000)]
Merge "Add default phone/sms to battery whitelist apps." into pi-dev
Jakub Pawlowski [Wed, 30 May 2018 03:05:21 +0000 (20:05 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84 am:
bc45dc9536 -s ours
am:
2d6209f71d -s ours
Change-Id: I0b7af0f19142f0aa5a039de6db22f292d16c76df
Sundong Ahn [Wed, 30 May 2018 02:54:35 +0000 (19:54 -0700)]
Merge "Build java.obex with java_sdk_library" am:
ad769993a9
am:
efb4ce221e
Change-Id: I31f65699193f026c7ed64a182b360791eee35608
Lucas Dupin [Wed, 30 May 2018 02:16:55 +0000 (19:16 -0700)]
Merge "Do not request focus during wake and unlock" into pi-dev
am:
58fc12e8fa
Change-Id: If45bd1074dc22c732074cfc59896614d4b28ab22
Selim Cinek [Wed, 30 May 2018 02:04:43 +0000 (19:04 -0700)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev
am:
1c6b809579
Change-Id: Ib9593bdbf872a9146a877b3ec22c101001b2ad13
Selim Cinek [Wed, 30 May 2018 01:59:25 +0000 (18:59 -0700)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
am:
d982210d89
Change-Id: I4b29f82656e3b3402f89cb5d66e71955287ac0b8
TreeHugger Robot [Wed, 30 May 2018 01:55:18 +0000 (01:55 +0000)]
Merge "Do not request focus during wake and unlock" into pi-dev
Jakub Pawlowski [Wed, 30 May 2018 01:49:17 +0000 (18:49 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84
am:
bc45dc9536 -s ours
Change-Id: I087f8de352c5c61db32d95ee8c47b6ab0bd171e2
Sungsoo Lim [Wed, 23 May 2018 15:28:27 +0000 (00:28 +0900)]
Update mGlobalBluetoothA2dpOn when active device changed
Also do not setForceUse when a2dp config without change.
Bug:
79982460
Test: manual
Change-Id: I789b03c00366f9fd78fd3a0305fdf2c11dfc23d2
Sundong Ahn [Wed, 30 May 2018 01:38:07 +0000 (18:38 -0700)]
Merge "Build java.obex with java_sdk_library"
am:
ad769993a9
Change-Id: I3a895f10880efb9ae916376f62d059941a25e417
TreeHugger Robot [Wed, 30 May 2018 01:29:40 +0000 (01:29 +0000)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 00:52:32 +0000 (00:52 +0000)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
Jakub Pawlowski [Wed, 30 May 2018 00:50:07 +0000 (17:50 -0700)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
am:
459888be84
Change-Id: Ibccfb97e0b41a9ef6af9fcb1da23870dbff7f9b9
Lucas Dupin [Wed, 30 May 2018 00:26:35 +0000 (17:26 -0700)]
Cancel dark animation when new one arrives
Not doing so causes weird artifacts when power button is pressed
multiple times in a row and StackScroller would have the wrong
state if unlocked with fingerprint while animation is still running.
Test: lock from lock screen, fp before animation ends
Test: press power multiple times on lock screen, look at smooth animation
Change-Id: I381bf367533983595cd22ff080f51465f6c0f750
Fixes:
79747888
Treehugger Robot [Wed, 30 May 2018 00:20:36 +0000 (00:20 +0000)]
Merge "Build java.obex with java_sdk_library"
Sundong Ahn [Fri, 18 May 2018 00:58:11 +0000 (09:58 +0900)]
Build java.obex with java_sdk_library
javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa
Selim Cinek [Wed, 30 May 2018 00:01:05 +0000 (17:01 -0700)]
Fixed an issue where the reply icon was disabled
Because it was disabled by an earlier update, a subsequent update
needs to enable the reply icon again, as the pending intent
might be valid again.
Change-Id: Ic562b399184e37c3870e1da7dc5d15baca43dc54
Fixes:
80250615
Test: add multiple messages where each one cancels the previous pendinging intent, observe clickable reply icon
Tracy Zhou [Tue, 29 May 2018 22:36:16 +0000 (15:36 -0700)]
Fix unwanted PIP window dismissal when moving to the bottom
Display#getSize() returns screen size excluding certain system decor
elements. We should get a more accurate size using Display#getRealSize()
minus bottom inset instead for calculating whether the PIP window
should be dismissed.
Fixes:
80367557
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests and manual test
Change-Id: I20cd8ccfa53bd7cc1cb7176280a01dbcb64b5745
Fan Zhang [Tue, 29 May 2018 23:41:36 +0000 (16:41 -0700)]
Merge "Update call log permission group icon." into pi-dev
am:
9a184cb7f3
Change-Id: I4d8ce9671c310e8b6c5b7ca94dd341dba8c2c449
TreeHugger Robot [Tue, 29 May 2018 23:23:18 +0000 (23:23 +0000)]
Merge "Update call log permission group icon." into pi-dev
Michael Wright [Fri, 25 May 2018 14:13:36 +0000 (15:13 +0100)]
Allow for any default vibration intensity level.
Because we can't always create the range of effects we'd like, we may
need different default intensity levels for different devices. This
works fine for prebaked effects, but for application defined amplitudes
we need to provide a scaling function. In addition, this scaling
function should leave amplitude values untouched in the default state so
that application developers produce the effects they expect.
Bug:
80275800
Test: manual
Merged-In: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
Change-Id: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
Lucas Dupin [Tue, 29 May 2018 22:41:03 +0000 (15:41 -0700)]
Do not request focus during wake and unlock
Focus was being required because the expansion of the panel
would trigger onFullyShown. Bouncer shouldn't need any
translation during WAKE_AND_UNLOCK.
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: go/sysui-bouncer-tests
Change-Id: I6d5c17ba89e14384859cf7fc91ca5cc2815dbfd9
Fixes:
80345339
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug:
69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Fan Zhang [Tue, 29 May 2018 17:55:51 +0000 (10:55 -0700)]
Add default phone/sms to battery whitelist apps.
This is to prevent essential default apps from being restricted in using
battery in the background.
Change-Id: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Merged-In: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Fixes:
76435804
Bug:
80428049
Test: robotests
Selim Cinek [Thu, 24 May 2018 23:37:22 +0000 (16:37 -0700)]
Fixed the animations of Messaging Layout, leading to overlaps
The animations could go wild at times, leading to overlapping
messages and ugly renderings. This improves the animations
overall and fixes those cases.
Test: add messages, observe animations
Fixes:
78114531
Fixes:
80409521
Change-Id: I6f21b87706ccc2e85f1edbd9489e4bf7e686d7d8
Makoto Onuki [Tue, 29 May 2018 22:29:11 +0000 (15:29 -0700)]
Merge "Disable battery saver tron log by default" into pi-dev
am:
dfb99b257b
Change-Id: I0d894c09ce1d6a96e60160ebd1246cdda4d9f9be
Christopher Tate [Tue, 29 May 2018 22:23:25 +0000 (15:23 -0700)]
Guard pre-O apps from malicious startForegroundService()
am:
0a82690868
Change-Id: I4dbab603ba2d42b5301539cc3110bef02868ee1e
Christopher Tate [Tue, 29 May 2018 22:20:59 +0000 (15:20 -0700)]
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev
am:
3ec17d31c5
Change-Id: I9a3a0d8e9fa348018a36c1e306aab822df377aa0
Chad Brubaker [Tue, 29 May 2018 22:15:11 +0000 (15:15 -0700)]
Merge "Remove downgrade check for targetSandboxLevel" into pi-dev
am:
d55f0108c5
Change-Id: I5c42e8d96666b4a3bbe942a4a4e59bd95a4028ae
Makoto Onuki [Tue, 29 May 2018 22:12:26 +0000 (22:12 +0000)]
Merge "Disable battery saver tron log by default" into pi-dev
Christopher Tate [Fri, 25 May 2018 22:15:44 +0000 (15:15 -0700)]
Guard pre-O apps from malicious startForegroundService()
Don't enforce the startForegroundService() requirement to transition to
foreground when the app hosting the service doesn't yet target the API
level at which this semantic was introduced.
Bug:
79377529
Test: manual (ApiDemos is pre-O)
Test: atest CtsAndroidAppTestCases
Change-Id: Ib0b970211d4ee6a86e22c89aff47b05403907ed5
TreeHugger Robot [Tue, 29 May 2018 21:55:52 +0000 (21:55 +0000)]
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev
Chad Brubaker [Tue, 29 May 2018 21:51:33 +0000 (21:51 +0000)]
Merge "Remove downgrade check for targetSandboxLevel" into pi-dev
Wale Ogunwale [Tue, 29 May 2018 21:42:35 +0000 (14:42 -0700)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
am:
c71ef2bc86
Change-Id: Ia4c4a6d146944040c28c16289392485d859d0507
TreeHugger Robot [Tue, 29 May 2018 21:33:03 +0000 (21:33 +0000)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
Michael Wright [Tue, 29 May 2018 21:31:36 +0000 (14:31 -0700)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
am:
eb2fdbb3c9
Change-Id: Iaff15045e39534124f4a78fa34e0319df9f111f5
Fan Zhang [Tue, 29 May 2018 21:22:16 +0000 (14:22 -0700)]
Update call log permission group icon.
Change-Id: I605ece95cd29405b9d63692d038f36390ac367ef
Fixes:
78230210
Test: visual
TreeHugger Robot [Tue, 29 May 2018 21:20:24 +0000 (21:20 +0000)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
Rohan Shah [Tue, 29 May 2018 21:07:56 +0000 (14:07 -0700)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
am:
a8464603ed
Change-Id: I546936b695ae0355a92aa3dd6131e369f784b98e
Tracy Zhou [Tue, 29 May 2018 21:00:41 +0000 (14:00 -0700)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev
am:
d7a053448b
Change-Id: Ifb83a3c334efe749c79a25f1e8c86a518b93df2c
Christopher Tate [Fri, 25 May 2018 20:12:12 +0000 (13:12 -0700)]
Extend startForegroundService() fg transition timeout to 10 seconds
Change-Id: I5e09205218e5ddb2ff536f7f5c20ac31c0c03bb1
Fixes:
80309073
Test: atest CtsAndroidAppTestCases
TreeHugger Robot [Tue, 29 May 2018 20:35:54 +0000 (20:35 +0000)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
Chavi Weingarten [Tue, 29 May 2018 20:32:58 +0000 (13:32 -0700)]
Merge "Add animation to running animation list before starting." into pi-dev
am:
908610fd74
Change-Id: Ia3b5ec7242ac438bcbe71cdf53ea5d45e4b57b15
TreeHugger Robot [Tue, 29 May 2018 20:26:23 +0000 (20:26 +0000)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev
Amith Yamasani [Tue, 29 May 2018 20:22:35 +0000 (13:22 -0700)]
Merge "Fix for missing location icon" into pi-dev
am:
8c4c359b25
Change-Id: I1e108f56230915e0950712a0fa2cc363e3ffbc9e
Chavi Weingarten [Tue, 29 May 2018 20:20:20 +0000 (20:20 +0000)]
Merge "Add animation to running animation list before starting." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 20:09:21 +0000 (20:09 +0000)]
Merge "Fix for missing location icon" into pi-dev
Winson Chung [Tue, 29 May 2018 19:59:00 +0000 (12:59 -0700)]
Merge "Fix regression in swiping over rotation button." into pi-dev
am:
287d4327cd
Change-Id: I576b5ab4c537d9fb3f221c8e2bae0339c63b7d57
TreeHugger Robot [Tue, 29 May 2018 19:45:35 +0000 (19:45 +0000)]
Merge "Fix regression in swiping over rotation button." into pi-dev
Glenn Kasten [Tue, 29 May 2018 19:21:18 +0000 (12:21 -0700)]
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
am:
a5d8c3718d
Change-Id: I7cd068ce53874be19ed4a81e32b87731b0d13c35
Tracy Zhou [Fri, 25 May 2018 07:04:57 +0000 (00:04 -0700)]
Update quick scrub tip according to the latest mock.
Mock: https://docs.google.com/presentation/d/1TCp1mREgsFAWq4hCnUaSRCpaqvDbzCVkN1mJuRMylIg/edit#slide=id.g3b3fe84fa7_15_0
Screenshot: https://screenshot.googleplex.com/HCVDEVHbdNU
Fixes:
79945911
Test: Manual test
Change-Id: I039e6d6be1b782281f7251a4bee1f3bf2bf03da3
Glenn Kasten [Tue, 29 May 2018 19:09:31 +0000 (19:09 +0000)]
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
Scott Main [Tue, 29 May 2018 19:00:38 +0000 (12:00 -0700)]
Merge "Delete static versions of _book.yaml and _project.yaml." into pi-dev
am:
c09501807a
Change-Id: I303be2abf342ff01424715e4a5e7418a856985ef
Lucas Dupin [Tue, 29 May 2018 18:55:55 +0000 (11:55 -0700)]
Merge "Enable systemui_theme feature flag" into pi-dev
am:
14e605d7e9
Change-Id: I47b44fd9f95e729642b383325fbfad159fb21c26
Yu-Han Yang [Tue, 29 May 2018 18:34:02 +0000 (11:34 -0700)]
Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev
am:
3bc533d22f
Change-Id: I042836448e9e2fe0340de8f4044e3afc8dc3d2ff
Scott Main [Tue, 29 May 2018 18:24:35 +0000 (18:24 +0000)]
Merge "Delete static versions of _book.yaml and _project.yaml." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:22:16 +0000 (18:22 +0000)]
Merge "Enable systemui_theme feature flag" into pi-dev
Scott Main [Thu, 3 May 2018 20:47:46 +0000 (13:47 -0700)]
Delete static versions of _book.yaml and _project.yaml.
These files are used by devsite only, so are maintained in piper.
bug:
79155333
test: make ds-docs (human review)
Change-Id: I5d5662a2a401872a669dba0916b20a79bcfca7ae
(cherry picked from commit
9e64abe7d79ef6abdd9c2d65e5f3bead9138cdb4)
Yu-Han Yang [Tue, 29 May 2018 18:02:31 +0000 (18:02 +0000)]
Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev
Daniel Sandler [Tue, 29 May 2018 17:01:02 +0000 (10:01 -0700)]
Merge "Remove direct-share target row animations and limit to one row." into pi-dev
am:
d8f3889b28
Change-Id: I02947ea217d0ae98f792a63fd24542aed1567afb