Commit Graph

422619 Commits

Author SHA1 Message Date
Jerry Chang
b84c0786b2 Merge "Fade away wallpapers when long pulse" into qt-dev
am: 14e6d18ec9

Change-Id: I0ee6f6d17990dd423d362e63805eb131bb401b4d
2019-06-22 17:16:17 -07:00
TreeHugger Robot
14e6d18ec9 Merge "Fade away wallpapers when long pulse" into qt-dev 2019-06-22 11:59:49 +00:00
Youming Ye
5cb9683fd7 [automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev
am: 23b6339ebd -s ours
am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history

Change-Id: I83aafdb229133e630c29f658e41da483b7cca44a
2019-06-21 17:42:16 -07:00
Robert Carr
641d4f27e3 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
am: 6397ab05f9

Change-Id: I023b06dc785cbf22783a426060aef55714a457d8
2019-06-21 17:32:54 -07:00
TreeHugger Robot
23b6339ebd Merge "Add carrier config for conference participants data support" into qt-dev 2019-06-22 00:12:34 +00:00
TreeHugger Robot
6397ab05f9 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 2019-06-22 00:04:19 +00:00
Amit Mahajan
3d5285c16b Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff
am: ab90035993

Change-Id: I02833dfbb5af129f326370d9c09968f167fef19e
2019-06-21 16:46:15 -07:00
Amit Mahajan
ab90035993 Merge "Set mOriginatingAddress and mRecipientAddress separately"
am: 44ea78d8ff

Change-Id: Ieb3e2b98cc61fef472fe471ae05bf9db7a9b66ed
2019-06-21 16:39:09 -07:00
Amit Mahajan
44ea78d8ff Merge "Set mOriginatingAddress and mRecipientAddress separately" 2019-06-21 23:23:12 +00:00
Youming Ye
60b023bfd0 Add carrier config for conference participants data support
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
Merged-In: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
2019-06-21 22:30:08 +00:00
Bill Yi
772a340689 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: I20dde9516b31187e21f5eb90f7dce45019d1f96e
2019-06-21 15:21:23 -07:00
Aran Ink
43369ea648 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
am: 985f21dd43

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1
2019-06-21 15:18:29 -07:00
TreeHugger Robot
019e1bf3fb Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-21 22:05:31 +00:00
TreeHugger Robot
985f21dd43 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 2019-06-21 22:00:47 +00:00
Andreas Gampe
e4a6ca7231 Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5
am: 70ad27cfb5

Change-Id: I7c11438bd295fd973f78302550e88833c84883b5
2019-06-21 13:52:40 -07:00
Andreas Gampe
70ad27cfb5 Merge changes Ie70d0155,I0692a91d,I8c5041a4
am: 4507201da5

Change-Id: Iaeb7c0e3b6a7ed63518de98a11df165b753fcb6e
2019-06-21 13:46:38 -07:00
Andreas Gampe
4507201da5 Merge changes Ie70d0155,I0692a91d,I8c5041a4
* changes:
  LockAgent: Add agent parameters to start_lock_agent script
  LockAgent: Add option to synthesize Java crash logging
  LockAgent: Add ability to generate a native crash
2019-06-21 20:26:43 +00:00
Lajos Molnar
ba0ce1d6a9 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev
am: cfb6f93443

Change-Id: I069b15b05fc1032177c4874cd7ff2d2041076e22
2019-06-21 12:50:37 -07:00
Lajos Molnar
cfb6f93443 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev 2019-06-21 19:38:17 +00:00
Aran Ink
5590c56102 Fix conflict between metrics_constants and settings_enums.
Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
(cherry picked from commit 08659ccdb7)
2019-06-21 19:36:20 +00:00
Selim Cinek
7cfda2b91c Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev
am: c65d4b728c

Change-Id: I5d316626d0b2e5f397b3e5ebac951bf4320e76ca
2019-06-21 12:05:58 -07:00
Selim Cinek
2a3b0f1a28 DO NOT MERGE: Fixed an issue about notification icons on AOD
am: d34e9d889a

Change-Id: If02cf694d7b93b509dcb728e1496690747e1b4c9
2019-06-21 12:05:52 -07:00
Philip P. Moltmann
3dbdc49334 Merge "Prevent loop in PermissionPolicyService" into qt-dev
am: 2c824e3a7a

Change-Id: Ia4f8c4c8762345bf65f890aba81d1111e654d37b
2019-06-21 12:03:28 -07:00
TreeHugger Robot
c65d4b728c Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev 2019-06-21 18:57:25 +00:00
TreeHugger Robot
2c824e3a7a Merge "Prevent loop in PermissionPolicyService" into qt-dev 2019-06-21 18:34:53 +00:00
Antoan Angelov
9e3a59f51a Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: ab34f61c3b

Change-Id: I49e43ed171d4ff45cf400ac9fc009ef78a2c8eef
2019-06-21 11:22:50 -07:00
Antoan Angelov
ab34f61c3b Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev 2019-06-21 18:07:22 +00:00
Ned Burns
bed6ce5f87 Merge "Free up memory in the ZigZagClassifierTest." into qt-dev
am: 0031e00da6

Change-Id: I62e3ae11cefeb6304e52b94b332cfc10553bd625
2019-06-21 10:56:24 -07:00
Winson Chung
3e683057b9 Merge "Continue with the animation if wallpaper fails to draw" into qt-dev
am: 7c77aaefb7

Change-Id: I51ef947fa595ede04e50a5e8442e7c6eaee36b83
2019-06-21 10:54:36 -07:00
Eric Laurent
39749b093e Merge "audioservice: special mute behavior for BT SCO volume" into qt-dev
am: 98edda5b5e

Change-Id: I235ecd52a1eaa3ccba063282fa5cb2dd5e68ecff
2019-06-21 10:34:57 -07:00
Ned Burns
0031e00da6 Merge "Free up memory in the ZigZagClassifierTest." into qt-dev 2019-06-21 17:31:42 +00:00
Winson Chung
7c77aaefb7 Merge "Continue with the animation if wallpaper fails to draw" into qt-dev 2019-06-21 17:29:27 +00:00
Winson Chung
fe57103cf3 Continue with the animation if wallpaper fails to draw
- This is preferable to canceling the animation, which the user just
  interprets as the nav gesture not working, and may fix some cases
  where the user may interpret a swipe up as not working if the wallpaper
  is slow to draw.

Bug: 135536076
Bug: 134091263
Test: atest RecentsAnimationTests
Test: atest RecentsAnimationControllerTests
Change-Id: Icf9ed20971a701a254383c65aa1811a99680ba51
2019-06-21 17:28:35 +00:00
Amit Mahajan
d364e2a7fb Merge "Replace the IDD with the '+' sign" am: 3fdedfab76
am: a187edb117

Change-Id: Idcd55e1c7f2a0d62ac3c966ebd1678450f173b9a
2019-06-21 10:23:14 -07:00
Amit Mahajan
a187edb117 Merge "Replace the IDD with the '+' sign"
am: 3fdedfab76

Change-Id: I2bc2968d3d8e9a1b9958311903246f8f4e44863e
2019-06-21 10:14:38 -07:00
Eric Laurent
98edda5b5e Merge "audioservice: special mute behavior for BT SCO volume" into qt-dev 2019-06-21 17:10:00 +00:00
Amit Mahajan
3fdedfab76 Merge "Replace the IDD with the '+' sign" 2019-06-21 16:34:12 +00:00
Bill Yi
89e5ab2762 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I992e06fd625131f8b7e838b601f6d31415b1d10f
2019-06-21 09:04:04 -07:00
Dave Mankoff
a90fe0a8c3 Free up memory in the ZigZagClassifierTest.
Test: atest SystemUITests
Bug: 135715570
Change-Id: Iddfcf8cc107254c397769b2b3c5251270ec0a3bd
2019-06-21 12:00:59 -04:00
Stanislav Zholnin
6f916a687c Add logging atom for PermissionApps fragment views
am: 32a89c15a7

Change-Id: I749c575b7eadbc3d51580dde23ec3a50c7b8a5ca
2019-06-21 08:53:53 -07:00
Stanislav Zholnin
25cf647b90 Add atom for logging of AppPermissionsFragment views.
am: dc3e2b35fb

Change-Id: I61f7ff871353ea2434adee80e04d7c2ff4c0b4e1
2019-06-21 08:46:12 -07:00
Stanislav Zholnin
0244d86622 Add atom for logging views in AppPermissionFragment
am: c9dda9ecdf

Change-Id: Ie31e10cd3d7adf56f0310cd8b3ea7881d245977a
2019-06-21 08:44:30 -07:00
Stanislav Zholnin
4de2e4173e Add logging atoms to record user actions in AppPermissionFragment (handheld devices only)
am: 3e0f9bcce0

Change-Id: I1c44883c232ecd841d8a4045bbb3ec927bfc7e67
2019-06-21 08:42:16 -07:00
Stanislav Zholnin
32a89c15a7 Add logging atom for PermissionApps fragment views
Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive -p com.google.android.permissioncontroller 218
Bug: 133401502
Bug: 134581123
Change-Id: I8f41d72c8f96a004911ef68491de8a214da4db24
Add logging to PermissionAppsFragment
2019-06-21 16:39:52 +01:00
Stanislav Zholnin
dc3e2b35fb Add atom for logging of AppPermissionsFragment views.
Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive -p com.google.android.permissioncontroller 217
Bug: 133401502
Bug: 134581123
Change-Id: I60e500e99a13a4f2dea6d7141fc87f5b8422c3a7
2019-06-21 16:26:08 +01:00
Stanislav Zholnin
c9dda9ecdf Add atom for logging views in AppPermissionFragment
Test: ./out/host/linux-x86/bin/statsd_testdrive -p com.google.android.permissioncontroller 216
Bug: 133401502
Bug: 134581123
Change-Id: I099de3a5ecd7ecf68df618b9738a0428e5792c98
2019-06-21 15:20:44 +00:00
Stanislav Zholnin
fe6ab956ea Merge "Add logging atoms to record user actions in LocationAccessCheck (handheld devices only)" into qt-dev
am: 762aa842ae

Change-Id: Idfe6b87ff2cc8567e6030f2eae7b18052a87a2cf
2019-06-20 22:26:48 -07:00
Stanislav Zholnin
3e0f9bcce0 Add logging atoms to record user actions in AppPermissionFragment
(handheld devices only)

Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive -p com.google.android.permissioncontroller 215
Bug:133401502
Bug:134581123

Change-Id: I2a0b15dfdd6398707a762c48602f970f14534b51
2019-06-21 05:23:33 +01:00
Stanislav Zholnin
762aa842ae Merge "Add logging atoms to record user actions in LocationAccessCheck (handheld devices only)" into qt-dev 2019-06-21 04:17:10 +00:00
Vishwath Mohan
254a302641 Merge "Switch trust agents to extend unlock mode by default." into qt-dev
am: b9cead91f8

Change-Id: Ifbc1e5d15337a7a678ee4ef9ef346dcf046cb69b
2019-06-20 19:36:14 -07:00