Jeff Chang
9744262ffa
Merge "Support the toast Window to show on the secondary display."
2018-08-17 01:14:51 +00:00
CY Cheng
e5d363d85b
[automerger skipped] resolve merge conflicts of e58c780571 to stage-aosp-master am: 0f7856add6
...
am: 217e5f01ca
2018-08-16 18:07:50 -07:00
CY Cheng
217e5f01ca
resolve merge conflicts of e58c780571 to stage-aosp-master
...
am: 0f7856add6
2018-08-16 16:41:38 -07:00
TreeHugger Robot
ce5035882b
Merge "Non-pre-multiplied notification text color"
2018-08-16 22:00:32 +00:00
TreeHugger Robot
c3e03900d4
Merge "Reach gesture implementation"
2018-08-16 21:45:53 +00:00
Lucas Dupin
64348d10ce
Merge "Avoid binder call when binding Slice"
2018-08-16 20:43:38 +00:00
TreeHugger Robot
eaff01c0b0
Merge "Never clear QS tile state."
2018-08-16 20:41:46 +00:00
Lucas Dupin
c81702eb62
Reach gesture implementation
...
Add configurable doze gesture. OEMs should define the gesture type
on a device overlay.
Bug: 111414690
Test: look at logs in adb shell dumpsys activity service com.android.systemui
Test: manual with alternative sensor event
Change-Id: I048b99b53151427006e42eb6b4780a420020cd78
2018-08-16 11:59:29 -07:00
TreeHugger Robot
b720d5d709
Merge "Fix circle in the opa ring and enlarge circle when opa is disabled (1/2)"
2018-08-16 18:58:08 +00:00
TreeHugger Robot
dee54a448b
Merge "Resolve NPE and unexpected error code in AccountManagerServiceTest"
2018-08-16 17:50:13 +00:00
TreeHugger Robot
6e6a4ce687
Merge "Talkback for edit QS, action as part of context."
2018-08-16 17:48:24 +00:00
Ryan Mitchell
ead275e19f
Merge "AAPT2: Compile --zip flag"
2018-08-16 17:26:08 +00:00
Ryan Mitchell
a60283fdd1
Merge "AAPT2: Reformatted dump command invocations"
2018-08-16 17:24:47 +00:00
Amin Shaikh
299c45c85d
Never clear QS tile state.
...
QSTile#clearState puts QS tiles in an invalid state that may not be
immediately rectified through QSTile#refreshState. In the case of
configuration changes, if a subclass implementation of
QSTile#handleSetListening does not trigger a refresh state, the
invalid state causes incorrect click handling.
Change-Id: I17eba133cf08c45a768e9e0ed8fda623e85b4370
Fixes: 69738120
Fixes: 110480955
Test: manual
2018-08-16 12:08:36 -04:00
Fabian Kozynski
8f3763dc71
Talkback for edit QS, action as part of context.
...
Accessibility context for moving or adding tiles has context label as
"Add tile X to position Y" or "Move tile X to position Y" while moving
cursor. No confirmation announcement after accepting.
Removed unused strings.
Change-Id: I6cf0fbe110f9231e592ee51820edd24541f98c5c
Fixes: 79154713
Test: Manual
2018-08-16 11:37:17 -04:00
Brad Stenning
1e14f9f92a
Bypass Zenmode filtering when the notification is marked as critical
...
Test: enable dnd and use test app to send Car_emergency
Bug: 111793232
Change-Id: I6492c1e48429c5f199680c76d53248da8072f4ff
2018-08-16 13:51:57 +00:00
Pavel Grafov
7c6ceb23db
Merge "Use DPM's counter for invalid password attempts"
2018-08-16 13:49:32 +00:00
Pavel Grafov
b90dc43e15
Use DPM's counter for invalid password attempts
...
Currently Keyguard uses separate counter for invalid password attempts
that is not persisted and is always initialized to zero after boot,
so if the user made several attempts and rebooted the device, the
device will show more allowed attempts before wipe than actually
available. The counter is also incorrectly reset to zero when
fingerprint is used successfully.
With this CL the same counter is used for that message and for actual
wipe triggering, it is persisted and is not reset upon reboot or
fingerprint authehtication.
Counting failed password attempts should be available in DevicePolicyManager
even without PackageManager.FEATURE_DEVICE_ADMIN.
Test: manual, tried using fingerprint and rebooting.
Bug: 112588257
Change-Id: I1f4012a95c6f6758885206f69e7ebe2c3704a567
2018-08-16 14:31:08 +01:00
Malcolm Chen
4c1651139d
[automerger skipped] Merge "Abstract set APIs in SubscriptionManager" am: 5165bbdeff am: 67c542f374
...
am: 8142499cdb
2018-08-16 04:25:31 -07:00
Steven Moreland
03ebe02009
Merge "Simplify IWeaver mocking code." am: d5dc5a7168 am: a64d04f5fe
...
am: db8351b2cd
2018-08-16 04:17:26 -07:00
Mathew Inwood
968fb9c5fa
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d717c04b12 am: 629a3828e2
...
am: 6b269a7e26
2018-08-16 04:09:37 -07:00
Mathew Inwood
a88948db0a
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 348a7e7315 am: 58b0d33e36
...
am: e0f11e8ce6
2018-08-16 04:03:07 -07:00
Mathew Inwood
7bdea4059e
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 4c3bf0f36a am: 2658ccd948
...
am: b2543065fc
2018-08-16 03:55:15 -07:00
Malcolm Chen
8142499cdb
Merge "Abstract set APIs in SubscriptionManager" am: 5165bbdeff
...
am: 67c542f374
2018-08-16 03:44:04 -07:00
CY Cheng
0f7856add6
resolve merge conflicts of e58c780571 to stage-aosp-master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
2018-08-16 10:43:49 +00:00
Mathew Inwood
5352a0230d
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: b558baa4cc am: 1b7a5028a0
...
am: 961ddb24fa
2018-08-16 03:43:23 -07:00
Mathew Inwood
147968d964
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d08509363c am: 62a722476a
...
am: b7e87b4ad5
2018-08-16 03:36:28 -07:00
Steven Moreland
db8351b2cd
Merge "Simplify IWeaver mocking code." am: d5dc5a7168
...
am: a64d04f5fe
2018-08-16 03:35:46 -07:00
Mathew Inwood
6b269a7e26
Merge "Add @UnsupportedAppUsage annotations" am: d717c04b12
...
am: 629a3828e2
2018-08-16 03:29:58 -07:00
Mathew Inwood
f60354183e
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 9feefd2f5f am: 3ef2a833ba
...
am: 96c9a3cbc8
2018-08-16 03:29:39 -07:00
Mathew Inwood
e0f11e8ce6
Merge "Add @UnsupportedAppUsage annotations" am: 348a7e7315
...
am: 58b0d33e36
2018-08-16 03:25:16 -07:00
Mathew Inwood
b2543065fc
Merge "Add @UnsupportedAppUsage annotations" am: 4c3bf0f36a
...
am: 2658ccd948
2018-08-16 03:20:10 -07:00
Mathew Inwood
4ece2cd4e4
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 06f2e6b7c8 am: b95f9ef8ed
...
am: 63e3a1744a
2018-08-16 03:20:01 -07:00
Mathew Inwood
961ddb24fa
Merge "Add @UnsupportedAppUsage annotations" am: b558baa4cc
...
am: 1b7a5028a0
2018-08-16 03:15:34 -07:00
Mathew Inwood
be54511aab
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: fd07385fea am: d1299b89dd
...
am: 42197c1b35
2018-08-16 03:13:27 -07:00
Mathew Inwood
b7e87b4ad5
Merge "Add @UnsupportedAppUsage annotations" am: d08509363c
...
am: 62a722476a
2018-08-16 03:10:41 -07:00
Mathew Inwood
96c9a3cbc8
Merge "Add @UnsupportedAppUsage annotations" am: 9feefd2f5f
...
am: 3ef2a833ba
2018-08-16 03:05:51 -07:00
Mathew Inwood
63e3a1744a
Merge "Add @UnsupportedAppUsage annotations" am: 06f2e6b7c8
...
am: b95f9ef8ed
2018-08-16 03:01:23 -07:00
Mathew Inwood
f0e185f3b5
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 72982a5404 am: 38d24c6b35
...
am: e79e451864
2018-08-16 03:00:59 -07:00
Mathew Inwood
42197c1b35
Merge "Add @UnsupportedAppUsage annotations" am: fd07385fea
...
am: d1299b89dd
2018-08-16 02:56:55 -07:00
Mathew Inwood
e79e451864
Merge "Add @UnsupportedAppUsage annotations" am: 72982a5404
...
am: 38d24c6b35
2018-08-16 02:50:23 -07:00
Mathew Inwood
4c83034b9c
[automerger skipped] resolve merge conflicts of b41f50dfd0 to pi-dev-plus-aosp
...
am: 9a5aa0c251
2018-08-16 02:43:08 -07:00
Mathew Inwood
9a5aa0c251
resolve merge conflicts of b41f50dfd0 to pi-dev-plus-aosp
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I2bcc7f0eee31a1775dd7a5dd0f291d0d37bc1292
Change-Id: I227ce12b7419ce8541a362f98adc50965b779c3b
2018-08-16 10:25:51 +01:00
Paul Hu
9ca6c587b6
Merge "[DMService]: Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission"
2018-08-16 06:00:27 +00:00
TreeHugger Robot
61bd31befe
Merge "Workaround regression in multiwindow mode change callback"
2018-08-16 05:18:20 +00:00
Treehugger Robot
e58c780571
Merge changes I7122ff52,I1140fa41,If359662a
...
* changes:
Fix Power menu background vanish
Add separated emergency option on power menu
Add emergency dialer option on power menu
2018-08-16 03:10:54 +00:00
Eric Laurent
a0f8661f9a
Merge "add config option for safe volume warning" into pi-dev am: 5cd354c89c
...
am: 3033c20d48
2018-08-15 19:40:14 -07:00
Beverly Tai
8a4cd983ad
[automerger skipped] Merge "DO NOT MERGE: Ensure zen SystemConditions are subscribed" into pi-dev am: 6b188c070e
...
am: efc0ac8e3d
2018-08-15 19:31:28 -07:00
Malcolm Chen
67c542f374
Merge "Abstract set APIs in SubscriptionManager"
...
am: 5165bbdeff
2018-08-15 19:27:12 -07:00
Eric Laurent
3033c20d48
Merge "add config option for safe volume warning" into pi-dev
...
am: 5cd354c89c
2018-08-15 18:55:40 -07:00
