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
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
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
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
TreeHugger Robot
fef593ca43
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-10-27 07:55:00 +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
Bill Yi
09bd03ba04
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
2017-10-26 21:16:36 -07:00
Bill Yi
99826ce0ab
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I35ac0b6a330fb71bc2aa0020ae8417664345e213
2017-10-26 21:10:31 -07:00
Christine Franks
755f07519a
Move color mode to DisplayTransformManager
...
am: 3d1d4a6628
-s ours
Change-Id: I7064dbf657bf93f80f863b6b0e963cb793752194
2017-10-27 03:23:14 +00:00
Fan Zhang
beef67ec74
Add strings to support multi-state vivid color management
...
am: a12b3d318d
Change-Id: I8d47a1c0982d6159cbeb7f7ee74241b4134e6f5a
2017-10-27 00:08:51 +00:00
Bill Yi
ac8f283a8a
Import translations. DO NOT MERGE
...
am: 68d7f87f78
-s ours
Change-Id: I408c19b81f14324b9d445f1a90a087b413583b7d
2017-10-27 00:08:39 +00:00
Romain Guy
298adb9b54
Add new color mode setting
...
am: 9143fb26b4
-s ours
Change-Id: I0ba85e94b8cbc85868949f1ed9f7d68242e1eb0b
2017-10-27 00:08:33 +00:00
Christine Franks
3d1d4a6628
Move color mode to DisplayTransformManager
...
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
2017-10-26 13:11:58 -07:00
Fan Zhang
a12b3d318d
Add strings to support multi-state vivid color management
...
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit e1543a3895
)
2017-10-26 10:10:46 -07:00
Bill Yi
68d7f87f78
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
2017-10-26 10:10:45 -07:00
Romain Guy
9143fb26b4
Add new color mode setting
...
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug: 68159303
Test: make RunSettingsRoboTests
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit 05fa18f847
)
2017-10-26 10:09:34 -07:00
Christine Franks
cd2b7aea5f
DO NOT MERGE - Move color mode to DisplayTransformManager
...
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
2017-10-25 12:42:23 -07:00
Chia-I Wu
94aa05059d
Merge "Add new color mode setting" into oc-mr1-dev
2017-10-25 04:28:59 +00:00
Romain Guy
05fa18f847
Add new color mode setting
...
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug: 68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
2017-10-24 22:19:09 +01:00
Bill Yi
66ecad49ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
2017-10-24 10:24:03 -07:00
Rajeev Kumar
dd8e66fa20
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
...
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug: 68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
2017-10-23 21:51:02 -07:00
Fan Zhang
e1543a3895
Add strings to support multi-state vivid color management
...
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
2017-10-23 23:45:47 +00:00
Jeff Sharkey
6b56423651
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours am: 07c4c8efed
am: d88820f3f6
am: 629553fb49
am: 397a3555b5
am: a637e31547
-s ours am: a00521b3a0
...
am: 16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
2017-10-18 21:52:46 +00:00
Jeff Sharkey
e39f0c21f9
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours am: 416ecb20a3
am: e341fe95bd
am: 85cb0b43da
am: 8f2a69fad3
am: 2a2d92eee8
-s ours am: a829548c12
...
am: 3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
2017-10-18 21:51:30 +00:00
Jeff Sharkey
16776b64c8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours am: 07c4c8efed
am: d88820f3f6
am: 629553fb49
am: 397a3555b5
am: a637e31547
-s ours
...
am: a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
2017-10-18 21:32:46 +00:00
Jeff Sharkey
3de9e565c8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours am: 416ecb20a3
am: e341fe95bd
am: 85cb0b43da
am: 8f2a69fad3
am: 2a2d92eee8
-s ours
...
am: a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
2017-10-18 21:31:42 +00:00
Jeff Sharkey
a00521b3a0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours am: 07c4c8efed
am: d88820f3f6
am: 629553fb49
am: 397a3555b5
...
am: a637e31547
-s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
2017-10-18 21:01:38 +00:00
Jeff Sharkey
a829548c12
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours am: 416ecb20a3
am: e341fe95bd
am: 85cb0b43da
am: 8f2a69fad3
...
am: 2a2d92eee8
-s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
2017-10-18 21:00:49 +00:00
Jeff Sharkey
a637e31547
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours am: 07c4c8efed
am: d88820f3f6
am: 629553fb49
...
am: 397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
2017-10-18 20:40:16 +00:00
Jeff Sharkey
2a2d92eee8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours am: 416ecb20a3
am: e341fe95bd
am: 85cb0b43da
...
am: 8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
2017-10-18 20:39:11 +00:00
Jeff Sharkey
397a3555b5
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours am: 07c4c8efed
am: d88820f3f6
...
am: 629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
2017-10-18 20:26:31 +00:00
Jeff Sharkey
8f2a69fad3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours am: 416ecb20a3
am: e341fe95bd
...
am: 85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
2017-10-18 20:25:25 +00:00
Jeff Sharkey
629553fb49
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours am: 07c4c8efed
...
am: d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
2017-10-18 20:06:55 +00:00
Jeff Sharkey
85cb0b43da
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours am: 416ecb20a3
...
am: e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
2017-10-18 20:06:00 +00:00
Jeff Sharkey
d88820f3f6
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
am: 91b1cb4b23
-s ours
...
am: 07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
2017-10-18 19:40:12 +00:00
Jeff Sharkey
e341fe95bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours
...
am: 416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
2017-10-18 19:39:10 +00:00
Jeff Sharkey
07c4c8efed
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
...
am: 91b1cb4b23
-s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
2017-10-18 19:27:49 +00:00
Jeff Sharkey
416ecb20a3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
...
am: fad1e6a315
-s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
2017-10-18 19:27:11 +00:00
Jeff Sharkey
91b1cb4b23
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
...
am: a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
2017-10-18 19:21:53 +00:00
Jeff Sharkey
fad1e6a315
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
...
am: c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
2017-10-18 19:20:50 +00:00
Jeff Sharkey
a954c8c716
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
...
am: 2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
2017-10-18 18:57:57 +00:00
Jeff Sharkey
c1ebc09ff0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
...
am: 9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
2017-10-18 18:57:03 +00:00
Jeff Sharkey
2bf724509c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours
...
am: 19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
2017-10-18 18:40:10 +00:00