OSDN Git Service
Android Build Merger (Role) [Tue, 19 Jun 2018 21:36:59 +0000 (21:36 +0000)]
Merge "Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev am:
6eb9ce63b8 am:
27a60d4eb4"
TreeHugger Robot [Tue, 19 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Update WebBackForwardList javadoc."
Yu-Han Yang [Tue, 19 Jun 2018 21:36:26 +0000 (14:36 -0700)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev am:
6eb9ce63b8
am:
27a60d4eb4
Change-Id: I078bc63363d6baabeb46ab73414a02a666a8905d
Android Build Merger (Role) [Tue, 19 Jun 2018 21:27:42 +0000 (21:27 +0000)]
[automerger] Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev am:
6eb9ce63b8 am:
1c7230ced4
Change-Id: Ieed91c6926278eee0a2b175879be7e47e3c4a653
Yu-Han Yang [Tue, 19 Jun 2018 21:26:35 +0000 (14:26 -0700)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
am:
6eb9ce63b8
Change-Id: Ie75c6c150450afd21a88736ec9d29d7dd17fdb87
Yu-Han Yang [Tue, 19 Jun 2018 21:26:34 +0000 (14:26 -0700)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
am:
6eb9ce63b8
Change-Id: I9d36901c6ab9015f4f6de06f64a43d97d5be5a11
Yu-Han Yang [Tue, 19 Jun 2018 21:08:48 +0000 (21:08 +0000)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
TreeHugger Robot [Tue, 19 Jun 2018 21:03:43 +0000 (21:03 +0000)]
Merge "Fix flaky ScheduleCalendarTest"
Android Build Merger (Role) [Tue, 19 Jun 2018 20:58:22 +0000 (20:58 +0000)]
Merge "Merge "Camera: codegen doc update" into pi-dev am:
941189bf28 am:
b2ba0d4cf3"
Shuzhen Wang [Tue, 19 Jun 2018 20:57:19 +0000 (13:57 -0700)]
Merge "Camera: codegen doc update" into pi-dev am:
941189bf28
am:
b2ba0d4cf3
Change-Id: Ieb2b98148301ee9a9e2135d81f691cd30c5f46f3
Brad Ebinger [Tue, 19 Jun 2018 20:56:59 +0000 (20:56 +0000)]
Merge "Revert isResolvingImsBinding ITelephony interface"
Android Build Merger (Role) [Tue, 19 Jun 2018 20:39:55 +0000 (20:39 +0000)]
Merge "Merge "Don't override targetVers with minCode" am:
3b0eba4499 am:
234a906ee1 am:
d5f926ba79"
Colin Cross [Tue, 19 Jun 2018 20:39:14 +0000 (13:39 -0700)]
Merge "Don't override targetVers with minCode" am:
3b0eba4499 am:
234a906ee1
am:
d5f926ba79
Change-Id: Id3a1efa5e926faa52778a0762855d668ff5e54ba
Android Build Merger (Role) [Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)]
[automerger] Merge "Camera: codegen doc update" into pi-dev am:
941189bf28 am:
f1558d2929
Change-Id: Iad180583db4457b41dc9c30a6a80ce46ef28a085
Shuzhen Wang [Tue, 19 Jun 2018 20:36:06 +0000 (13:36 -0700)]
Merge "Camera: codegen doc update" into pi-dev
am:
941189bf28
Change-Id: Ic66b738d058eb25d015365e933086c0a6d820511
Shuzhen Wang [Tue, 19 Jun 2018 20:36:02 +0000 (13:36 -0700)]
Merge "Camera: codegen doc update" into pi-dev
am:
941189bf28
Change-Id: I4e1c8960339ada1d31d473c39ab7565c215a76d1
Torne (Richard Coles) [Tue, 19 Jun 2018 20:29:54 +0000 (16:29 -0400)]
Update WebBackForwardList javadoc.
Update javadoc for WebBackForwardList and WebHistoryItem. Remove
references to history items being updated as this no longer occurs, and
clarify in clone() that there's no need to acutally do this any more.
Also remove a bunch of implementation notes about
atomicity/synchronisation that are being rendered attached to the return
value and likely aren't even true any more, let alone relevant to
developers.
Bug:
74593032
Test: make offline-sdk-docs
Change-Id: I4ce33133d2ff18e7376d768c7a2e076ecd2a8b95
Colin Cross [Tue, 19 Jun 2018 20:20:48 +0000 (13:20 -0700)]
Merge "Don't override targetVers with minCode" am:
3b0eba4499
am:
234a906ee1
Change-Id: Ie0eaed7be80819484a41bca5a0bd396138f5870f
Shuzhen Wang [Tue, 19 Jun 2018 20:19:38 +0000 (20:19 +0000)]
Merge "Camera: codegen doc update" into pi-dev
Colin Cross [Tue, 19 Jun 2018 20:10:23 +0000 (13:10 -0700)]
Merge "Don't override targetVers with minCode"
am:
3b0eba4499
Change-Id: Ied3eb76b2b996500c540965d970fc9cc05fccbd9
Lucas Dupin [Tue, 19 Jun 2018 19:46:08 +0000 (19:46 +0000)]
Merge "Simplify scrimmed bouncer condition"
TreeHugger Robot [Tue, 19 Jun 2018 19:26:45 +0000 (19:26 +0000)]
Merge "Fix variable name"
TreeHugger Robot [Tue, 19 Jun 2018 19:20:28 +0000 (19:20 +0000)]
Merge "Change app ops state timeouts to elapsed realtime"
nharold [Tue, 19 Jun 2018 18:55:04 +0000 (11:55 -0700)]
[automerger skipped] Merge "Use Uppercase instead of Lowercase for PLMN Decode" am:
e61215cab1 am:
df00ad1a4b -s ours
am:
0e092b7ef6 -s ours
Change-Id: I80d8e46990806c5b4f281fe1166919e9d2db7884
nharold [Tue, 19 Jun 2018 18:46:18 +0000 (11:46 -0700)]
[automerger skipped] Merge "Use Uppercase instead of Lowercase for PLMN Decode" am:
e61215cab1
am:
df00ad1a4b -s ours
Change-Id: Iaca1e63e9f9f5606c388f2bf4c1180145d0abb5e
nharold [Tue, 19 Jun 2018 18:39:07 +0000 (11:39 -0700)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"
am:
e61215cab1
Change-Id: I8c75abbd7574072e9b6c501b5fabf61bf2148592
Lucas Dupin [Tue, 19 Jun 2018 17:50:04 +0000 (10:50 -0700)]
Simplify scrimmed bouncer condition
Similar logic existed in StatusBar and StatusBarKeyguardViewManager,
this can lead to errors since it's easy to update one place and forget
about the other.
Test: go/sysui-bouncer-tests
Test: force simPin security mode
Change-Id: I4a22cba5144844cf982f259da13db0c8effbeae6
Colin Cross [Tue, 19 Jun 2018 18:14:39 +0000 (18:14 +0000)]
Merge "Don't override targetVers with minCode"
Lucas Dupin [Tue, 19 Jun 2018 17:42:42 +0000 (10:42 -0700)]
Fix variable name
Variable was using member prefix
Test: make
Change-Id: I75b9839eaad57585d2f397156785b9eeadb4dad1
Fan Zhang [Tue, 19 Jun 2018 17:19:44 +0000 (17:19 +0000)]
Merge "Remove old suggestion code."
nharold [Tue, 19 Jun 2018 17:16:11 +0000 (17:16 +0000)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"
Brad Ebinger [Thu, 14 Jun 2018 00:11:50 +0000 (17:11 -0700)]
Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.
Bug:
109762920
Test: GTS/Unit tests for ImsService
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
Stan Iliev [Thu, 14 Jun 2018 22:00:10 +0000 (18:00 -0400)]
Restore matrix transform for out-of-order render nodes
Restore matrix for render nodes, which are drawn out of order.
Test: DrawChildBug-debug.apk draws correctly, new test ag/
4355529
Bug:
80173852
Change-Id: I3f789a7cf0ee5816da84255199b265643f95af1c
Ming-Shin Lu [Tue, 19 Jun 2018 03:11:57 +0000 (03:11 +0000)]
Merge "Prevent NPEs when no focusable stack."
lumark [Fri, 15 Jun 2018 07:43:12 +0000 (15:43 +0800)]
Prevent NPEs when no focusable stack.
Fallback to home stack when no focusable stack
(e.g. launcher force stopped & enter PIP mode with no other app task),
Fix NPEs for logWindowState & getTopRunningActivity from null stack.
Change-Id: I0a0134661dfc20ff844a0bc19ce6833242f4a865
Fixes:
110078217
Test: Manual
Test: atest ActivityStackSupervisorTests ActivityStackTests ActivityStarterTests
felkachang [Thu, 24 May 2018 07:38:04 +0000 (15:38 +0800)]
Fix the icon overlay after density change
After showing the heads up for the fullscreen notification, to
change the density by user will have the status bar icons
not show normally. It will the only one icon overlay on the
clock but actually there are more than one icons. And, it can't
back to normal after expandable notification and collapse the
notification panel.
The root cause is that all of instances of PhoneStatusBarView,
Clock, HeadsUpStatusBarView, and HeadsUpAppearanceController are
recreated by FragmentManager after configuration density and
font changing. The new HeadsUpAppearanceController status is
neither consistent with HeadsUpManager's status nor the state of
the previous instances.
The solution is that to apply the onSaveInstanceState and
onRestoreInstanceState in PhoneStatusBarView, Clock, PanelBar, and
HeadsUpStatusBarView. To make sure that the values of the fields
in the new instance, which are set by other source, have the
consistence with the state of the old instances.
HeadsUpAppearanceController's Constructor.
To hook onLayoutChangedListener to sync the status with
HeadsUpManager's status to HeadsUpStatusBarView if there is a
pinnded heads up notification.
In original, PanelBar.mState is the only one state to save. Instead
of only saving one, to save the view tree state in
CollapsedStatusBarFragment.onSaveInstanceState and restore the view
state in CollapsedStatusBarFragment.onViewCreated.
CollapsedStatusBarFragment.mDisabled1 doesn't need to save and
restore because CommandQueue.recomputeDisableFlags will give it
the correct value.
After density changed, RemoteViews will reinflate the instances of
NotificationHeaderView and the wrapper instances of
NoticationContentView will also recreated in
NotificationContentView.setAmbientChild. The recreated instance
should synchronized with the ExpandableNotificationRow intance.
Fixes:
80224819
Fixes:
80426687
Test: atest SystemUITests
Change-Id: Ia3f8a0f138f403c8e0c74c00d56bd93baf604d3a
Android Build Merger (Role) [Tue, 19 Jun 2018 02:08:21 +0000 (02:08 +0000)]
Merge "Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810 am:
65c04cd491 am:
574b298e9e"
Jack Yu [Tue, 19 Jun 2018 02:07:15 +0000 (19:07 -0700)]
Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810 am:
65c04cd491
am:
574b298e9e
Change-Id: Ib69ec8bd57533112fcda72927db49c58619cf7ee
Wale Ogunwale [Tue, 19 Jun 2018 02:06:26 +0000 (02:06 +0000)]
Merge "Switched ActivityStackSupervisor.mService to ActivityTaskManagerService (8/n)"
Jack Yu [Tue, 19 Jun 2018 01:57:57 +0000 (18:57 -0700)]
Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810
am:
65c04cd491
Change-Id: I67a28d628e14798dc8d31a20536f2248c8cc0b8f
Jack Yu [Tue, 19 Jun 2018 01:49:09 +0000 (18:49 -0700)]
Merge "Fixed the incorrect permission for data/network service binding"
am:
a9bf7a8810
Change-Id: Ic3c463d7e7755efcb048e84c338ffbe256475874
Treehugger Robot [Tue, 19 Jun 2018 00:36:38 +0000 (00:36 +0000)]
Merge "Fixed the incorrect permission for data/network service binding"
Android Build Merger (Role) [Mon, 18 Jun 2018 23:44:54 +0000 (23:44 +0000)]
[automerger skipped] [DO NOT MERGE] Update kernel timezone if call to setTime causes DST offset to change skipped:
c5d576de23
Change-Id: I2de32fcc46815c1a2f025b6385feb73ef27ee6c6
Christine Hallstrom [Mon, 21 May 2018 21:27:23 +0000 (14:27 -0700)]
[DO NOT MERGE] Update kernel timezone if call to setTime causes DST offset to change
If AlarmManager#setTime is called with a time that has a different DST
offset than the current system time, update the kernel timezone offset
with the correct value for the time being set.
Test: Manually set time to two times with different DST offsets, ensure
kernel time zone updates properly.
Bug:
80142036
Bug:
80098370
Change-Id: I8884bce471cf4b95372d6d33a36e8c9e92bd6a96
(cherry picked from commit
f5d585aec90743c2b3d691b9e307d11dd7a63c65)
Fan Zhang [Mon, 18 Jun 2018 18:30:00 +0000 (11:30 -0700)]
Remove old suggestion code.
Change-Id: I2ab9b32ea7622228b0d61b3a16f0695ab04597d7
Fixes:
110361022
Test: robotests
Yin-Chia Yeh [Fri, 15 Jun 2018 22:37:08 +0000 (15:37 -0700)]
Camera: codegen doc update
Test: N/A. Doc update
Bug:
109666939
Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c
TreeHugger Robot [Mon, 18 Jun 2018 23:03:28 +0000 (23:03 +0000)]
Merge "Add same padding to mobile datatype as wifi"
Wale Ogunwale [Tue, 8 May 2018 21:28:07 +0000 (14:28 -0700)]
Switched ActivityStackSupervisor.mService to ActivityTaskManagerService (8/n)
Objects that contain or represent activities like ActivityStackSupervisor
can no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I9fd5564f69170201c560bd3325594541db146106
Oscar Shu [Mon, 18 Jun 2018 22:36:42 +0000 (22:36 +0000)]
Merge "metrics: add proto field for wifi radio usage"
Erik Wolsheimer [Mon, 18 Jun 2018 22:14:25 +0000 (22:14 +0000)]
Merge changes from topic "am-
b983e737-8063-4bbb-b24b-
3dea9090b65e"
* changes:
[automerger skipped] DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream skipped:
a43886bcaa
DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream
Beverly [Mon, 18 Jun 2018 20:42:14 +0000 (16:42 -0400)]
Fix flaky ScheduleCalendarTest
Accurately get the next day.
Test: atest com.android.server.notification.ScheduleCalendarTest
Change-Id: Idc20944679b44b30a40eb65d958df9fffec69375
Fixes:
110355145
Colin Cross [Mon, 18 Jun 2018 20:38:11 +0000 (13:38 -0700)]
Merge "Fix ManifestMerger issues" into stage-aosp-master am:
669c4d7ae7
am:
fae24f5aa2
Change-Id: I66e9b74a7db9ae9a0c4040e37a3f2807b24aa391
Colin Cross [Mon, 18 Jun 2018 20:29:08 +0000 (13:29 -0700)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
am:
669c4d7ae7
Change-Id: I54eb99fde659f6c1651ae34c49d6cd81ba198e93
TreeHugger Robot [Mon, 18 Jun 2018 20:15:00 +0000 (20:15 +0000)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
Colin Cross [Mon, 18 Jun 2018 18:47:45 +0000 (11:47 -0700)]
Don't override targetVers with minCode
If a package contains minSdkVersion="Q" targetSdkVersion="25",
targetCode will be initialized to "Q" when reading minCode,
but targetVers will be set to "25". targetCode overrides
targetVers, so this results in the computed targetSdkVersion
being "Q". If minSdkVersion were instead "28", the computed
targetSdkVersion would be "Q".
Make the computed targetSdkVersion consistent by leaving
targetCode and targetVers unset while parsing minSdkVersion,
and then setting them to minCode and minVers if there is
no targetSdkVersion attribute.
Bug:
110167203
Bug:
110353795
Test: install DeviceHealthChecks, verify targetSdk=25
Change-Id: I9547e9b4720543f0c892cbf4de92888c8eead44f
Nan Zhang [Mon, 18 Jun 2018 19:57:03 +0000 (12:57 -0700)]
Merge "Enabled annotations for Metalava based api-stubs." am:
79d3bf6e54 am:
0da95a5d64
am:
7c96332354
Change-Id: Iea928b33e984049904ca0fdba4923ee06cfd5971
Android Build Merger (Role) [Mon, 18 Jun 2018 19:44:41 +0000 (19:44 +0000)]
Merge "Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev am:
1b65af27d8 am:
e7f0de228b"
felkachang [Mon, 18 Jun 2018 19:44:16 +0000 (12:44 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev am:
1b65af27d8
am:
e7f0de228b
Change-Id: Icc155a27deaaabfbdbdd5bb6df84e4debd54c91f
TreeHugger Robot [Mon, 18 Jun 2018 19:44:06 +0000 (19:44 +0000)]
Merge "No-op code cleanup of TSMS#getCurrentSpellCheckerSubtype"
Nan Zhang [Mon, 18 Jun 2018 19:37:13 +0000 (12:37 -0700)]
Merge "Enabled annotations for Metalava based api-stubs." am:
79d3bf6e54
am:
0da95a5d64
Change-Id: Ie3385442c0bf28a1da52cb2d687ed45921604f80
Dianne Hackborn [Mon, 18 Jun 2018 19:29:44 +0000 (12:29 -0700)]
Change app ops state timeouts to elapsed realtime
We want to use elapsed realtime for this instead of
uptime, so that the device going to sleep does not extend
the duration for which an application may have access to
an app op.
Test: manual
Bug:
109754053
Change-Id: I2bb1018b4c370cc6188eb7811ef29ae0e344b19b
Android Build Merger (Role) [Mon, 18 Jun 2018 19:22:09 +0000 (19:22 +0000)]
[automerger skipped] DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream skipped:
a43886bcaa
Change-Id: I26225bb9c186bf9a5a9e42bdd8130bfe1a29066b
Erik Wolsheimer [Tue, 6 Jun 2017 21:58:35 +0000 (14:58 -0700)]
DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream
Bug:
62147987
Bug:
28455483
Exempt-From-Owner-Approval: Will not merge to master
Change-Id: I4577c66d7d66c22c8b9e2ab0b50a59e97d7e9647
TreeHugger Robot [Mon, 18 Jun 2018 19:17:31 +0000 (19:17 +0000)]
Merge "Fix broken language matching logic in TSMS"
Nan Zhang [Mon, 18 Jun 2018 19:13:35 +0000 (12:13 -0700)]
Merge "Enabled annotations for Metalava based api-stubs."
am:
79d3bf6e54
Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
Android Build Merger (Role) [Mon, 18 Jun 2018 19:09:58 +0000 (19:09 +0000)]
[automerger] Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev am:
1b65af27d8 am:
10ab15dee0
Change-Id: I5b8e28e40de9ee97b715d53d11249337398967c1
felkachang [Mon, 18 Jun 2018 19:09:20 +0000 (12:09 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
am:
1b65af27d8
Change-Id: Ic1759f350085ec6340faf9f03eddde4c0eaa0b71
felkachang [Mon, 18 Jun 2018 19:07:53 +0000 (12:07 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
am:
1b65af27d8
Change-Id: I7236f5d24afc376709b43b032af328732aab963c
Nathan Harold [Thu, 7 Jun 2018 23:00:22 +0000 (16:00 -0700)]
Use Uppercase instead of Lowercase for PLMN Decode
A change to IccUtils converted from using lowercase
to uppercase and broke the PLMN trimming logic.
This resolves bugs where the platform may report
5-digit PLMNs with an invalid trailing 'F' character.
This fixes an issue introduced by aosp/575243, which
impacts the Manual Network Selection menu and
the public API.
Bug:
79561854
Test: compilation
Merged-In: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
Change-Id: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
(cherry picked from commit
b70fbc85f7496dd1b43ed70f0c480184ba5e9585)
TreeHugger Robot [Mon, 18 Jun 2018 18:42:47 +0000 (18:42 +0000)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
Lucas Dupin [Mon, 18 Jun 2018 18:31:49 +0000 (11:31 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev am:
0e52664b0c
am:
d7330c4888
Change-Id: I5d46625235cbf58090b42594af3b49b290f7e878
TreeHugger Robot [Mon, 18 Jun 2018 18:28:19 +0000 (18:28 +0000)]
Merge "Fix StringIndexOutOfBoundsException in AccessibilityUtils"
Aaron Heuckroth [Mon, 18 Jun 2018 18:22:14 +0000 (18:22 +0000)]
Merge "Add delay to notifications before they can be dismissed."
Android Build Merger (Role) [Mon, 18 Jun 2018 18:18:40 +0000 (18:18 +0000)]
[automerger] Merge "Fade to black without showing system wallpaper" into pi-dev am:
0e52664b0c am:
2e575f413c
Change-Id: I28b6f791597056c07b504d070ab704d74a37d1df
Lucas Dupin [Mon, 18 Jun 2018 18:17:44 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I7aeb34e75245f5bc9974110d9847efd03445acbd
Lucas Dupin [Mon, 18 Jun 2018 18:17:34 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I68c83452ffcff8424aa58a0527a14f90497990d1
Aaron Heuckroth [Thu, 14 Jun 2018 18:28:08 +0000 (14:28 -0400)]
Add delay to notifications before they can be dismissed.
Test: Run jank tests. Create notifications with a delay, then attempt
to swipe them away as soon as they are perceivable to the user.
Swiping during the animation should not result in notification dismissal,
but swiping after the animation completes should.
Fixes:
70293267
Change-Id: Ibca02666255693255185b8bd326cc97d8c574b2e
Lucas Dupin [Mon, 18 Jun 2018 18:08:41 +0000 (18:08 +0000)]
Merge "Fade to black without showing system wallpaper" into pi-dev
Selim Cinek [Mon, 18 Jun 2018 17:52:53 +0000 (10:52 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am:
ed9df0d176
am:
ae158f3925
Change-Id: Ieb7a009989c3f505c1f799e7eabc243929957a8b
Android Build Merger (Role) [Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)]
[automerger] Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am:
ed9df0d176 am:
5c2a056a83
Change-Id: I501b10108f3f075b171ed0d97bc0ae1385e49a55
Selim Cinek [Mon, 18 Jun 2018 17:45:01 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: Ib607094d49ba35e14dd33d6993e343cda7594b5f
Selim Cinek [Mon, 18 Jun 2018 17:45:00 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: I7f9778580993a4762895839136209d307fdc765a
TreeHugger Robot [Mon, 18 Jun 2018 17:41:22 +0000 (17:41 +0000)]
Merge "Improved logging on autofill authentication."
felkachang [Mon, 11 Jun 2018 07:56:15 +0000 (15:56 +0800)]
Fix NotificaitonPanelView x-axis shift with IME
IME will trigger the fitSystemWindow. And, there is a difference of
the parameter insets between IME and no IME. The insets.right and
insets.left report 0 without IME but positive number with IME
because IME is a type of system window and trigger fitSystemWindow
and then take the cutout as part of system window.
StatusBarWindowView handle the following condition
cutout > 0 && cutout == systemWindowInset and make its children not
layout on the safe inset both of cut out and system window. In order
to handle that cut out become system window, to take the maximum of
cut out and system window to make sure that the safe inset is
decided in StatusBarWindowView and its view decent only care about
the corner cut out.
Because StatusBarWindowView make both of PhoneStatusBarView's parent
and NotificationPanelView to have the margin for both of cutout and
system window, the counting of the padding and panel translation of
the HeadsUpStatusBarView need to do the relative changes.
Change-Id: Iafdc6a85e0e7d360b1bfc1e820f6e0779c32753f
Fix:
79957419
Fix:
109945733
Fix:
109865908
Test: atest SystemUITests
Selim Cinek [Mon, 18 Jun 2018 17:32:20 +0000 (17:32 +0000)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
TreeHugger Robot [Mon, 18 Jun 2018 17:31:32 +0000 (17:31 +0000)]
Merge "Fixes for enqueued adjustments"
Lucas Dupin [Mon, 18 Jun 2018 17:21:42 +0000 (10:21 -0700)]
Merge "Pulse animation synchronization" into pi-dev am:
32066387e1
am:
f7dc3e269c
Change-Id: I9df3bdc93d2a6999334984bbdf487c73dc9f869c
Android Build Merger (Role) [Mon, 18 Jun 2018 17:09:56 +0000 (17:09 +0000)]
[automerger] Merge "Pulse animation synchronization" into pi-dev am:
32066387e1 am:
a5ca4128ef
Change-Id: I9b24483005a0cb0a714fc5816200d60e165c4144
Lucas Dupin [Mon, 18 Jun 2018 17:09:35 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: I8c3737cff95213b63fbee10195c6a246829b2843
Fan Zhang [Mon, 18 Jun 2018 16:42:38 +0000 (09:42 -0700)]
Fix StringIndexOutOfBoundsException in AccessibilityUtils
The string splitter is a sigleton but the access is not thread-safe. So
now it's changed to be a local instance to avoid threading problems.
Also removed a few unused test classes as clean up.
Change-Id: Ia2b3f3058fcbb0b28afff4e3d1b29184072bf45e
Fixes:
110255579
Test: robotests
Lucas Dupin [Mon, 18 Jun 2018 17:09:03 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: Ia2c8219d869fb61d22b5b81bf641fd488a5415a9
TreeHugger Robot [Mon, 18 Jun 2018 16:57:24 +0000 (16:57 +0000)]
Merge "Pulse animation synchronization" into pi-dev
Treehugger Robot [Mon, 18 Jun 2018 16:55:28 +0000 (16:55 +0000)]
Merge "Enabled annotations for Metalava based api-stubs."
TreeHugger Robot [Mon, 18 Jun 2018 16:49:51 +0000 (16:49 +0000)]
Merge "Remove dependency on IME subtype from TSMS"
Lucas Dupin [Mon, 11 Jun 2018 23:18:15 +0000 (16:18 -0700)]
Fade to black without showing system wallpaper
When on the lock screen, and going to AOD animated, user would
temporarily see the system wallpaper. That's not what we want,
we want to fade from semi-transparent black to black, on top
of the backdrop - lock screen wallpaper or media art.
Test: press power on the lock screen when playing media
Test: press power on the lock screen after dismissing media
Test: unlock from AOD
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Fixes:
80575770
Change-Id: I6796e844add889ff86be0cd2052db7c5d5073039
Jorim Jaggi [Mon, 18 Jun 2018 16:18:52 +0000 (09:18 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am:
e8a1e7a423
am:
04749aa5c6 -s ours
Change-Id: I3145ec152a52aa552114b6fcf4f1e02ec24bd42f
Android Build Merger (Role) [Mon, 18 Jun 2018 16:10:26 +0000 (16:10 +0000)]
[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am:
e8a1e7a423 skipped:
ea7b5d8020
Change-Id: I73708c52edf65365e4bf961b51211710d05bfcdb
Jorim Jaggi [Mon, 18 Jun 2018 16:09:43 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I160e9cab3b4ebd4d5a39443b8ea3990a7943d102
Jorim Jaggi [Mon, 18 Jun 2018 16:09:33 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I2b70059cc6735bfdf3fd60f4837b413f8966c637
Jorim Jaggi [Mon, 18 Jun 2018 15:52:09 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev