Commit Graph

339137 Commits

Author SHA1 Message Date
Yi Jin
4ef28b7353 Use Descriptor and Reflection to set table-like data, in this case
protobuf-cpp-full is worth using.

Test: tested it locally by running the command in README.md
Change-Id: I1c38bd7fee6d914c4a579ed82b9be4a8177e45b9
2017-08-14 18:53:10 -07:00
TreeHugger Robot
4abbe93dce Merge "Fix parsing enum types in incident report tool as well as adding some additional loggings" 2017-08-14 20:07:22 +00:00
TreeHugger Robot
9b739de45c Merge "Don't run Smart Select Animation on multiple lines" 2017-08-14 19:32:46 +00:00
Tyler Gunn
c11b599664 Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev am: 9ad54229f5
am: aa43d2f26a

Change-Id: Ibb180b38c93aa33bf8e81737a360cd801d0eb953
2017-08-14 19:15:18 +00:00
Tyler Gunn
aa43d2f26a Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev
am: 9ad54229f5

Change-Id: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3
2017-08-14 19:05:31 +00:00
TreeHugger Robot
9ad54229f5 Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev 2017-08-14 18:49:14 +00:00
Jason Monk
4a883ab5a0 Merge "Always show global actions on the right" into oc-mr1-dev am: a2991d045d
am: 38b54f61c0

Change-Id: I127449a35817ad15cd72e0565cfc3a82efd13808
2017-08-14 18:31:19 +00:00
Android Build Merger (Role)
79ce6d7ea3 Merge "Merge "Switch battery saver to sentence case" into oc-mr1-dev am: 449bb694b4 am: 37074fd0d7" 2017-08-14 18:25:58 +00:00
Wale Ogunwale
7ff3ff33df Merge "Switch WindowContainer to use ConfigurationContainer" 2017-08-14 18:24:45 +00:00
Jason Monk
962fb9d675 Merge "Switch battery saver to sentence case" into oc-mr1-dev am: 449bb694b4
am: 37074fd0d7

Change-Id: I51a4e421ad453bf639f3eaf3e7e00875d0c35195
2017-08-14 18:22:13 +00:00
Jason Monk
eb5600a2a0 Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev am: d35b6a7c26
am: 61d0fd0e70

Change-Id: I42d0157d6d3d7371cb2b9fa5d18e1d3deacf2b6e
2017-08-14 18:18:31 +00:00
Jason Monk
38b54f61c0 Merge "Always show global actions on the right" into oc-mr1-dev
am: a2991d045d

Change-Id: Ibf5098d39349a024509a764373ea0bfb8d18d8be
2017-08-14 18:14:19 +00:00
Jason Monk
37074fd0d7 Merge "Switch battery saver to sentence case" into oc-mr1-dev
am: 449bb694b4

Change-Id: If4a572c8601ff6e6ad4e77b09002142bd3ab760e
2017-08-14 18:08:00 +00:00
TreeHugger Robot
a2991d045d Merge "Always show global actions on the right" into oc-mr1-dev 2017-08-14 18:04:10 +00:00
Jason Monk
61d0fd0e70 Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev
am: d35b6a7c26

Change-Id: I48f774cf277543c5224958520e3bd78aac776a0c
2017-08-14 18:03:12 +00:00
Android Build Merger (Role)
211ec527d6 Merge "Merge "Use first letter of user for icons." into oc-mr1-dev am: 30f9d275e9 am: c9f6d38378" 2017-08-14 17:56:35 +00:00
Petar Šegina
855396d37a Don't run Smart Select Animation on multiple lines
This behavior is currently broken due to the format of the rectangles
returned by Layout::getSelection. Let's disable the animation in
multiline scenarios until this behavior is fixed.

Test: manual - enable Smart Select flag and test over single and
multiple lines
Change-Id: Id0c49a0d69a8f2bdb449cfc8f0ed43e529f41cc1
2017-08-14 18:55:12 +01:00
Guliz Tuncay
db18b5520f Merge "Multi-user aware TSMS" 2017-08-14 17:52:48 +00:00
Bryan Eyler
4f358bc729 Merge "Use first letter of user for icons." into oc-mr1-dev am: 30f9d275e9
am: c9f6d38378

Change-Id: Ie1662263a220f0328fb5c21ebeb6ab16dffd4ba8
2017-08-14 17:50:47 +00:00
TreeHugger Robot
449bb694b4 Merge "Switch battery saver to sentence case" into oc-mr1-dev 2017-08-14 17:42:09 +00:00
Bryan Eyler
c9f6d38378 Merge "Use first letter of user for icons." into oc-mr1-dev
am: 30f9d275e9

Change-Id: I4863e25aaf36df1fcd89925475762f60a3218915
2017-08-14 17:39:11 +00:00
TreeHugger Robot
d35b6a7c26 Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev 2017-08-14 17:34:54 +00:00
Bryan Eyler
30f9d275e9 Merge "Use first letter of user for icons." into oc-mr1-dev 2017-08-14 17:30:44 +00:00
Mathieu Chartier
7c59757910 Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev am: fcfe9d8418
am: 4348f0e57b

Change-Id: I1208eff18de7d2a7989ee8d1b432b0549f8749db
2017-08-14 17:20:36 +00:00
Jeremy Joslin
ea58747371 Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev am: 66042e0caf
am: e5cdc925dd

Change-Id: I673af2506d51945dc02f484efe98facfbe99b943
2017-08-14 17:11:10 +00:00
Mathieu Chartier
4348f0e57b Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev
am: fcfe9d8418

Change-Id: Ida4184144880ef5c3f6a5522231b0a3edc31a4e4
2017-08-14 17:06:32 +00:00
Jeremy Joslin
e5cdc925dd Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev
am: 66042e0caf

Change-Id: I8a090f5dfbdc6d47de9838d8c8bf48f95d831531
2017-08-14 16:59:06 +00:00
Mathieu Chartier
fcfe9d8418 Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev 2017-08-14 16:53:12 +00:00
TreeHugger Robot
66042e0caf Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev 2017-08-14 16:50:50 +00:00
Tyler Gunn
9a351ca849 Ensure CallId is not null when connection creation is complete.
When calling "get" on the mConnectoinById map, a null callId will result
in an NPE.

In findConnectionForAction, defaulting to returning the "null" connection
which is the same behavior as if it isn't found.
In notifyCreateConnectionComplete, specifically checking if the callId
is null and skipping the onCreateConnectionComplete callback.
This scenario is possible if the connection is remove from the
ConnectionService before the connection complete callback comes back from
Telecom.

Test: Manual
Fixes: 62588734
Change-Id: Ie610c51155ed417e0f916000fe20e4484bdb6603
2017-08-14 16:30:41 +00:00
Jason Monk
ac3e08e584 Always show global actions on the right
It should be aligned with the physical power buttons.

Test: visual
Change-Id: Icec9fe00fdce42d0bf347691ab7629c4ca38df78
Fixes: 63846903
2017-08-14 15:25:38 +00:00
Jason Monk
a3c3d850fb Make sure network tests pass with airplane mode on
Test: runtest systemui
Change-Id: I0cc619d28b6802c0791c5880651ce1f91ea83f35
Fixes: 38023097
2017-08-14 11:04:42 -04:00
Adrian Roos
b1671e0e1a Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev am: 4996a35843
am: ee5e02170a

Change-Id: Ibd8827de410a337eb0d469392cc49eefcd6ff1e3
2017-08-14 15:03:06 +00:00
Adrian Roos
ee5e02170a Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev
am: 4996a35843

Change-Id: I3d7d8255703d805e8d74a22e1ef8e1f8476960d4
2017-08-14 14:50:31 +00:00
Jason Monk
ce2f47ec6b Switch battery saver to sentence case
Test: strings
Change-Id: I01bc6f3621758dc155347946b8a15c885c695b2c
Fixes: 27844148
2017-08-14 10:50:25 -04:00
TreeHugger Robot
4996a35843 Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev 2017-08-14 14:43:50 +00:00
Bill Yi
e583831418 Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev am: 62f46d483b -s ours
am: 0057210610  -s ours

Change-Id: Iba3d1a9d89986f3bbfb8618b780852829df558d3
2017-08-14 13:53:46 +00:00
Bill Yi
733034977b Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev am: be0d49abcd -s ours
am: c81813e6b6  -s ours

Change-Id: I6b70b44c5183430fc91c7e9f56a4a8d1c2e1924e
2017-08-14 13:50:54 +00:00
Bill Yi
0057210610 Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
am: 62f46d483b  -s ours

Change-Id: I81b76102be9a4bcc69763572a9c438497245940b
2017-08-14 13:44:04 +00:00
Bill Yi
c81813e6b6 Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
am: be0d49abcd  -s ours

Change-Id: I3a315752493d9ed1ab20b4287b828c0cc11e7ef9
2017-08-14 13:40:22 +00:00
Bill Yi
ee9f5c9c8e Merge "Revert "Import translations. DO NOT MERGE"" 2017-08-14 13:37:57 +00:00
Bill Yi
58f429278d Revert "Import translations. DO NOT MERGE"
This reverts commit 58d65a51d4.
Exempt-From-Owner-Approval: translation import

Change-Id: I0871fb39c8c152d7d7926871270e3a652fbd0b77
2017-08-14 13:37:04 +00:00
Bill Yi
62f46d483b Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev 2017-08-14 13:36:36 +00:00
Bill Yi
2d1e020b2f Revert "Import translations. DO NOT MERGE"
This reverts commit 4a4ff70ab2.

Change-Id: I27cd5204cc25e664b2722815f9efcfa0fde6b48b
2017-08-14 13:35:56 +00:00
Bill Yi
95a84df52b Merge "Revert "Import translations. DO NOT MERGE"" 2017-08-14 13:34:18 +00:00
Bill Yi
c552d1f1fc Revert "Import translations. DO NOT MERGE"
This reverts commit e5520175cb.
Exempt-From-Owner-Approval: translation import

Change-Id: Ie6bfbaf6629f7201a4d359e8ab19598ef239b84e
2017-08-14 13:33:37 +00:00
Bill Yi
be0d49abcd Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev 2017-08-14 13:31:57 +00:00
Bill Yi
97c7729bb6 Revert "Import translations. DO NOT MERGE"
This reverts commit 24a1e22eb8.

Change-Id: Ib2fd9e19b362357652566487ae8e84a9ef993b4b
2017-08-14 13:30:57 +00:00
Michal Karpinski
10a23a69bb Add extra about SDK version that system restore happened from to ACTION_SETTING_RESTORED intent am: 6135a26551
am: 1a7a743fea

Change-Id: If9b944d16dfc297f8cd0a3eded191170fd278b90
2017-08-14 13:28:57 +00:00
Michal Karpinski
1a7a743fea Add extra about SDK version that system restore happened from to ACTION_SETTING_RESTORED intent
am: 6135a26551

Change-Id: I25663df1efd88216b0bdbe22cc53aaaaf0d3dd75
2017-08-14 13:21:18 +00:00