Fan Zhang
0c0728a947
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5
...
am: b4db530aa5 -s ours
Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
2017-10-31 22:59:07 +00:00
Fan Zhang
b4db530aa5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08
...
am: 769e1e31f5
Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
2017-10-31 22:57:12 +00:00
Fan Zhang
769e1e31f5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
...
am: cd66862b08
Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
2017-10-31 22:54:07 +00:00
Fan Zhang
cd66862b08
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
...
am: 8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
2017-10-31 22:50:43 +00:00
Fan Zhang
8bffdc2613
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
2017-10-31 22:47:13 +00:00
Jeff Sharkey
46b8d7ac78
Merge "Change storage migration to use quota APIs."
...
am: a0afdb0c49
Change-Id: Ie97a6001eb23314c65aff291f53cf575b7637870
2017-10-31 22:24:12 +00:00
Fan Zhang
931504bb24
Merge "Add a readme with instructions on running tests"
...
am: 08217cbd4b
Change-Id: I654b6bf10ca75715e433d1382756e380723ae324
2017-10-31 22:23:15 +00:00
Treehugger Robot
a0afdb0c49
Merge "Change storage migration to use quota APIs."
2017-10-31 21:47:19 +00:00
Treehugger Robot
08217cbd4b
Merge "Add a readme with instructions on running tests"
2017-10-31 21:42:28 +00:00
Fan Zhang
c583d803af
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours am: 96cc88e218 -s ours am: 4aec1cee4e -s ours
...
am: 9c79a61f95 -s ours
Change-Id: Ibaa13379d6b0ed9bd69d66f80989ae7d534efcbf
2017-10-31 21:38:07 +00:00
Fan Zhang
9c79a61f95
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours am: 96cc88e218 -s ours
...
am: 4aec1cee4e -s ours
Change-Id: Id74bf2c46e0454e030e9fc0c4ee231450241aa79
2017-10-31 21:33:53 +00:00
Fan Zhang
4aec1cee4e
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours
...
am: 96cc88e218 -s ours
Change-Id: Ic182e3df1a283123d0d53c13499af1ed7501767e
2017-10-31 21:29:53 +00:00
Fan Zhang
96cc88e218
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b
...
am: 0c59dca90d -s ours
Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf
2017-10-31 21:25:58 +00:00
Fan Zhang
0c59dca90d
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b
...
am: adabc7561b
Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
2017-10-31 21:23:57 +00:00
Fan Zhang
adabc7561b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da
...
am: 80af194f8b
Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
2017-10-31 21:21:53 +00:00
Fan Zhang
80af194f8b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
...
am: e79c26a9da
Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
2017-10-31 21:16:32 +00:00
Fan Zhang
e79c26a9da
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
...
am: e69c4dcb8f
Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
2017-10-31 21:11:26 +00:00
Fan Zhang
5c1a1363c7
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
2017-10-31 21:03:52 +00:00
Fan Zhang
e69c4dcb8f
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
2017-10-31 21:03:08 +00:00
Fan Zhang
83e7581690
Add a readme with instructions on running tests
...
Test: is a test
Change-Id: I5f3a4745a1b2376259b2aab8df58d8660c3fe0bc
2017-10-31 13:14:58 -07:00
Fan Zhang
1cc50ae190
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes: 64339515
Bug: 38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
2017-10-31 19:38:07 +00:00
Fan Zhang
c519347aee
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80 -s ours am: 9bb4e0b794 -s ours
...
am: fddccf0838 -s ours
Change-Id: I2a7a57a4b63b5ed34e65801f27582f26b3eb1baf
2017-10-31 19:08:16 +00:00
Fan Zhang
fddccf0838
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80 -s ours
...
am: 9bb4e0b794 -s ours
Change-Id: I139f18df764f1d888cc6d7687aba5a23ab30053f
2017-10-31 18:47:59 +00:00
Fan Zhang
9bb4e0b794
Merge "Set device credential's Window flag to be SECURE." into oc-dev
...
am: e3d0bbcc80 -s ours
Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef
2017-10-31 18:36:12 +00:00
Fan Zhang
e3d0bbcc80
Merge "Set device credential's Window flag to be SECURE." into oc-dev
2017-10-31 18:25:36 +00:00
Jeff Sharkey
efe4b48d9b
Change storage migration to use quota APIs.
...
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
(cherry picked from commit fc522c677d )
Bug: 36056324
Test: builds, boots
Merged-In: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
Change-Id: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
2017-10-31 09:48:11 -07:00
Courtney Goeltzenleuchter
66e4dac393
Check system support of wide-color
...
getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.
Bug: 64801219
Bug: 67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.
Change-Id: If28e52da174dd460850bc84744818979f52add78
(cherry picked from commit bae1b24ba3 )
2017-10-31 08:25:37 -06:00
Bill Yi
2e841fd17e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a68a0f0463 -s ours
...
am: 9a983dd72f -s ours
Change-Id: I072b7f8f6e320f2339b1b134193aabc2c654604c
2017-10-31 03:46:08 +00:00
Bill Yi
d3528de4c9
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 89688902b8 -s ours
Change-Id: I443ed7404e199e87ec76d7f4724f0b66de7f3e19
2017-10-31 03:45:23 +00:00
Bill Yi
9a983dd72f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: a68a0f0463 -s ours
Change-Id: I4b9282935fe15d3c1418edb43506aad058a3e485
2017-10-31 03:41:23 +00:00
TreeHugger Robot
89688902b8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-10-31 03:35:52 +00:00
TreeHugger Robot
a68a0f0463
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-10-31 03:34:28 +00:00
Fan Zhang
601fdf83f9
Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev am: 83c49be1da
...
am: fb06488712
Change-Id: I1153c5c89819e8083d77d0ecd9e3ca982d199f40
2017-10-31 02:48:01 +00:00
Fan Zhang
fb06488712
Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev
...
am: 83c49be1da
Change-Id: Iacdaedc972e9d8ba013860be1442620c46c4f19d
2017-10-31 02:44:34 +00:00
TreeHugger Robot
83c49be1da
Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev
2017-10-31 02:37:43 +00:00
Bill Yi
97eec4be9f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: If1e768b33481061f37bac9612b862ece348f15fb
2017-10-30 18:16:54 -07:00
Bill Yi
e2dbd96742
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Idb8eeaa4ee52a3d250c95a164a7bf28512d32901
2017-10-30 18:12:54 -07:00
xiyuan.wang
029aeca640
Merge "Fix app crash while adding new user" am: 1e5cd4c3df
...
am: 5cf3dcd11c
Change-Id: I328ca5045b1fabf9f6756cc0265458bda531fccf
2017-10-30 18:17:47 +00:00
xiyuan.wang
5cf3dcd11c
Merge "Fix app crash while adding new user"
...
am: 1e5cd4c3df
Change-Id: I0cb1c3a228b85edb6303d4f6c33037e4f787f550
2017-10-30 18:03:09 +00:00
Treehugger Robot
1e5cd4c3df
Merge "Fix app crash while adding new user"
2017-10-30 17:43:46 +00:00
xiyuan.wang
b6fa43d980
Fix app crash while adding new user
...
Settings app crashes when tapping Home key while adding new user because
UserSettings#showDialog() is called after onSaveInstanceState().
To fix this issue, a dialog should not be shown after onPause().
Fixes: 68485787
Test: manual - tap Home key while adding new user
Change-Id: I2ddd119b6558927798a52c7977e6fd8137734c93
2017-10-30 19:55:56 +09:00
Bill Yi
603e6e45b0
Import translations. DO NOT MERGE
...
am: 198f1320b7 -s ours
Change-Id: I7e6935fcc3adbe7bdf62bf60ca6635e3fb49b0de
2017-10-30 07:35:56 +00:00
Bill Yi
198f1320b7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I17237599107b5576cfc9261b866614c1a69fb531
2017-10-28 23:21:49 -07:00
Qi Ding
5dbb625508
Merge "Fix current tab is changed when rotating device" am: 3d8b442e8d
...
am: 35a3260b91
Change-Id: I1ae5051dfb35d75c99d0d44ce2689b6e81d47a81
2017-10-27 18:52:47 +00:00
Qi Ding
35a3260b91
Merge "Fix current tab is changed when rotating device"
...
am: 3d8b442e8d
Change-Id: I4f8499492b7fbe26e40da649e38ab0a65667e55d
2017-10-27 18:47:40 +00:00
Treehugger Robot
3d8b442e8d
Merge "Fix current tab is changed when rotating device"
2017-10-27 18:38:37 +00:00
Bill Yi
70360ed230
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: fef593ca43 -s ours
Change-Id: I69b5120d889d669598215e276588500e340d4e26
2017-10-27 08:00:14 +00:00
TreeHugger Robot
fef593ca43
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-10-27 07:55:00 +00:00
Bill Yi
02ec9a9903
Import translations. DO NOT MERGE am: 09bd03ba04 -s ours
...
am: 1919e72747 -s ours
Change-Id: Ic4e18896e1855f115a03a99a87118e422e2edce0
2017-10-27 07:48:14 +00:00
Bill Yi
1919e72747
Import translations. DO NOT MERGE
...
am: 09bd03ba04 -s ours
Change-Id: I6ff0a464ed719315f276e794f0851541b200691c
2017-10-27 07:41:44 +00:00