Bryce Lee
d6dfd4a8b4
Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
...
am: 5b76ce1b2b
Change-Id: I8386f0693d79708b4d32bb7108139a75e273eeb1
2017-07-28 18:18:52 +00:00
Bryce Lee
5b76ce1b2b
Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
2017-07-28 17:57:09 +00:00
Evan Laird
c38935cc7c
Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev
...
am: 905fcf0787
Change-Id: I47c8b0d13a1bc511088d1a895017522831f42b8d
2017-07-28 17:55:25 +00:00
TreeHugger Robot
905fcf0787
Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev
2017-07-28 17:47:50 +00:00
Android Build Merger (Role)
59d9947535
Merge "Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f am: 5934ae605a" into oc-dr1-dev-plus-aosp
2017-07-28 17:41:16 +00:00
Benjamin Miller
2c2d19504c
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f
...
am: c058675b80
Change-Id: Ib052cafb46a2e7830a7573c8a112147bc821cf0c
2017-07-28 17:39:42 +00:00
Benjamin Miller
943c2ebb09
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f
...
am: 5934ae605a
Change-Id: I98e995494cfd5e7599f10041137bcd67b626abc5
2017-07-28 17:39:42 +00:00
Jason Monk
a23c062b08
Merge "Revert "NavBar: Don't reorient as much, its a waste of work"" into oc-dr1-dev
...
am: 6683cc6a83
Change-Id: Iac6962fe8848504907a48a5019c12ae2119b2c4d
2017-07-28 17:33:13 +00:00
Benjamin Miller
5934ae605a
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
...
am: 91f16ace4f
Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7
2017-07-28 17:30:18 +00:00
Benjamin Miller
c058675b80
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
...
am: 91f16ace4f
Change-Id: I9dd5d6641307589250d781dce11c4f2186b3c8fb
2017-07-28 17:30:16 +00:00
Jason Monk
6683cc6a83
Merge "Revert "NavBar: Don't reorient as much, its a waste of work"" into oc-dr1-dev
2017-07-28 17:24:12 +00:00
Jason Monk
49a5ed1aa9
Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev
...
am: ac73492ca5
Change-Id: I215bbc6f67a678cc8289c77736d059fe78e4837f
2017-07-28 17:20:11 +00:00
TreeHugger Robot
91f16ace4f
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
2017-07-28 17:11:28 +00:00
Jason Monk
38fd11a2a7
Merge "Fix recents split-screen icon" into oc-dr1-dev
...
am: 148db9dfa6
Change-Id: I5446350fed23d757d9cae5db5012d660828e9236
2017-07-28 17:10:45 +00:00
TreeHugger Robot
ac73492ca5
Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev
2017-07-28 17:10:03 +00:00
Jason Monk
148db9dfa6
Merge "Fix recents split-screen icon" into oc-dr1-dev
2017-07-28 17:02:19 +00:00
Svetoslav Ganov
8780a92093
Report permission flags for all protections based on SDK am: adb8c522a8
...
am: 436b901dbb
Change-Id: I78a3d297413627b7e654495288de9004df5f73dd
2017-07-28 17:00:16 +00:00
Android Build Merger (Role)
bccc7625ec
Merge "Report permission flags for all protections based on SDK am: adb8c522a8 am: fc862c9f86" into oc-dr1-dev-plus-aosp
2017-07-28 16:55:48 +00:00
Svetoslav Ganov
70ec94fd12
Report permission flags for all protections based on SDK am: adb8c522a8
...
am: fc862c9f86
Change-Id: Ie08845d6e5afa8f75e1cc5392a1f5c2166d06d20
2017-07-28 16:54:06 +00:00
Mathieu Chartier
45122be763
Merge "Add AsyncTask to compiled classes" into oc-dr1-dev
...
am: 19b979ca85
Change-Id: I6c4fdea65b69f195832ee93cf4199b0ce4d69d4e
2017-07-28 16:50:30 +00:00
Svetoslav Ganov
436b901dbb
Report permission flags for all protections based on SDK
...
am: adb8c522a8
Change-Id: Ia30269ec2097d5978ae3e0b3930a38b3f4441ea4
2017-07-28 16:42:59 +00:00
Svetoslav Ganov
fc862c9f86
Report permission flags for all protections based on SDK
...
am: adb8c522a8
Change-Id: I259df147b8345f6bdba5a1ed31d01d3c42e90518
2017-07-28 16:42:09 +00:00
Mathieu Chartier
19b979ca85
Merge "Add AsyncTask to compiled classes" into oc-dr1-dev
2017-07-28 16:33:18 +00:00
Jason Monk
06c711334d
Merge "QS Tweaks" into oc-dr1-dev
...
am: 48db7e6dcd
Change-Id: I1fe993222e111ea505d6544a8bbba84f602ec758
2017-07-28 16:10:43 +00:00
TreeHugger Robot
48db7e6dcd
Merge "QS Tweaks" into oc-dr1-dev
2017-07-28 16:00:10 +00:00
Bill Yi
78a545453d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 31816f7464 -s ours
Change-Id: Idfb4e5bd9d7a86867f0a8a3020d437db50eee42c
2017-07-28 15:23:01 +00:00
TreeHugger Robot
31816f7464
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-28 15:16:38 +00:00
Jason Monk
199a2d052e
Revert "NavBar: Don't reorient as much, its a waste of work"
...
This reverts commit 19d2865dd5 .
Change-Id: I4ec532fc2d06b0e39a5acff88b8d503064e06cfa
Bug: 63605852
2017-07-28 11:08:35 -04:00
Bryce Lee
0e4a6dfb3f
Remove rotation and app bounds from Configuration diff.
...
The presence of these new flags leads to issues with application that
do not expect their presence. Since these flags can appear at
critical times, such as on orientation change, these issues are
brought to the surface often.
This CL remedies this problem by first removing the rotation
property. It is not used and the original issue of orientation and
Configuration alignment has been addressed. For app bounds, the CL
reverts the behavior back to identifying diffs as a screen size
change.
Fixes: 64004417
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke
Change-Id: I1fabb564dfb5c13d897336708523cf7cd5099fa0
2017-07-28 07:49:01 -07:00
Jason Monk
2ecf97efe5
Nav haptics: increase threshold to 150 and don't do on long clicks
...
Test: touch
Change-Id: I1014670036400c0c8e2db4afd63ecfaf103f6fb7
Fixes: 62655913
2017-07-28 10:48:09 -04:00
Adrian Roos
dea3a7d171
Merge "AOD: Fix more flickering" into oc-dr1-dev
...
am: f2c8a24f56
Change-Id: I667dad9bd4ee1adc9dd83056728422e8be6bb725
2017-07-28 14:46:36 +00:00
TreeHugger Robot
f2c8a24f56
Merge "AOD: Fix more flickering" into oc-dr1-dev
2017-07-28 14:40:45 +00:00
Wale Ogunwale
b52e3dd149
Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev
...
am: 932bc6dffc
Change-Id: Ie9a892f3e343170043d9683ef233c6fabc22cf03
2017-07-28 14:28:35 +00:00
TreeHugger Robot
932bc6dffc
Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev
2017-07-28 14:17:01 +00:00
Adrian Roos
092bb2fd8c
Merge "AOD: Increase alpha values when dozing" into oc-dr1-dev
...
am: 19d8e4e04e
Change-Id: I13a82962cf43401f192c9eecb475e3aea847166b
2017-07-28 13:15:55 +00:00
TreeHugger Robot
19d8e4e04e
Merge "AOD: Increase alpha values when dozing" into oc-dr1-dev
2017-07-28 13:08:13 +00:00
Wale Ogunwale
bfdfd2a31b
Don't freeze display if it isn't okay to animate.
...
In window manager world you freeze the display because you want to
do a rotation animation and that has the effect to allowing anything
to influence the display orientation while the display is frozing.
However, when the display is being turned off with the power button
we still want the lockscreen to influence the display orientation so
there is no rotation animation when the screen comes one.
We already have a concept okToAnimate() used to determine if we should
run animations. We now also use it to determine if we should freeze the
display since freezing the display is a result of want to running a
rotation animation.
Fixes: 63760853
Test: Repro. steps from bug.
Test: go/wm-smoke
Change-Id: I9abeda1bd0018f519772f0edce05ea8025efbbbe
2017-07-28 12:08:09 +00:00
Adrian Roos
a5c6322dc5
AOD: Fix more flickering
...
Fixes an issue where waking up with fingerprint would not work correctly
if the keyguard was not locked.
Also fixes flickering when triggering the Assistant on AOD.
To achieve the above, also ensures that whenever the scrim is visible, the status bar window is expanded.
Finally, log the alpha and tint of the scrims to systrace.
Fixes: 63983663
Fixes: 63065774
Bug: 63531607
Test: Disable power key locks immediately, trigger AOD, unlock with fingerprint. Verify no flicker; Trigger Assistant from AOD in various scenarios. Verify no flicker.
Change-Id: I0db2938afdde23c1995f6ac905d4a6abdf25cdec
2017-07-28 14:04:40 +02:00
Benjamin Miller
05fef7ed69
Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
...
VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors.
Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN
Test: make ds-docs and output staged UserManager page
Bug: 63582789
Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672
(cherry picked from commit 1f83e4d498 )
2017-07-28 09:56:24 +00:00
Bill Yi
5f6bc5e1c4
Import translations. DO NOT MERGE
...
Change-Id: I2c47595d891804dd376dd6b14764d20d61891b01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 01:50:05 -07:00
Svetoslav Ganov
adb8c522a8
Report permission flags for all protections based on SDK
...
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reported
for normal and dangerous permissions
Change-Id: I87b10a7695d8ecfa7156525d6f3d101fc0639513
bug:62755026
2017-07-28 05:46:53 +00:00
Android Build Merger (Role)
c5629eb230
Merge "Revert "Report permission flags for all protections based on SDK" am: 784b56e1e6 am: 076d6f7669" into oc-dr1-dev-plus-aosp
2017-07-28 05:31:32 +00:00
Bart Sears
8fa765e3ca
Revert "Report permission flags for all protections based on SDK" am: 784b56e1e6
...
am: 076d6f7669
Change-Id: I6ae36ac13888f4d24830d3a972597bdb8ab7c15b
2017-07-28 05:29:21 +00:00
Bart Sears
20c93bfe75
Revert "Report permission flags for all protections based on SDK" am: 784b56e1e6
...
am: 1a5a9be9ad
Change-Id: Iac6546b48308836b7a4bf41295a363032326d990
2017-07-28 05:26:30 +00:00
Bart Sears
076d6f7669
Revert "Report permission flags for all protections based on SDK"
...
am: 784b56e1e6
Change-Id: Ice7dde53c5613f48d013424a7e99203fd854e532
2017-07-28 05:17:52 +00:00
Bart Sears
1a5a9be9ad
Revert "Report permission flags for all protections based on SDK"
...
am: 784b56e1e6
Change-Id: I80086249438fff193dc64d9c4d1a6b1468f8c4a1
2017-07-28 05:17:48 +00:00
Bart Sears
784b56e1e6
Revert "Report permission flags for all protections based on SDK"
...
This reverts commit 852cf98cb8 .
Change-Id: I62763bf85ec95a02a245c6b503aa34bb0e9d997a
2017-07-28 05:05:38 +00:00
Hugo Benichi
a3b78abb16
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev
...
am: a03bf7acd1 -s ours
Change-Id: I13204ae131642c95df242245764689294b0fd85f
2017-07-28 04:38:25 +00:00
Hugo Benichi
a03bf7acd1
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev
2017-07-28 04:27:16 +00:00
Svetoslav Ganov
73f379a68c
Merge "Report permission flags for all protections based on SDK am: 852cf98cb8" into oc-dev-plus-aosp
...
am: d1c39228fd
Change-Id: I4b4a3cdb32498883e8a769ddfac13c296c9854b7
2017-07-28 03:06:17 +00:00