Fan Zhang
fddccf0838
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80 -s ours
...
am: 9bb4e0b794
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
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
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
2017-10-31 03:46:08 +00:00
Bill Yi
d3528de4c9
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 89688902b8
2017-10-31 03:45:23 +00:00
Bill Yi
9a983dd72f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: a68a0f0463
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
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
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
2017-10-30 18:17:47 +00:00
xiyuan.wang
5cf3dcd11c
Merge "Fix app crash while adding new user"
...
am: 1e5cd4c3df
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
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
2017-10-27 18:52:47 +00:00
Qi Ding
35a3260b91
Merge "Fix current tab is changed when rotating device"
...
am: 3d8b442e8d
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
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
2017-10-27 07:48:14 +00:00
Bill Yi
1919e72747
Import translations. DO NOT MERGE
...
am: 09bd03ba04
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
c854bf6a3f
Move color mode to DisplayTransformManager am: 3d1d4a6628 -s ours
...
am: 755f07519a
2017-10-27 03:59:08 +00:00
Christine Franks
755f07519a
Move color mode to DisplayTransformManager
...
am: 3d1d4a6628
2017-10-27 03:23:14 +00:00
Fan Zhang
64d6c6bb48
Add strings to support multi-state vivid color management am: a12b3d318d
...
am: beef67ec74
2017-10-27 00:24:44 +00:00
Bill Yi
35aec82297
Import translations. DO NOT MERGE am: 68d7f87f78 -s ours
...
am: ac8f283a8a
2017-10-27 00:24:23 +00:00
Romain Guy
3aa7b9fcbc
Add new color mode setting am: 9143fb26b4 -s ours
...
am: 298adb9b54
2017-10-27 00:24:11 +00:00
Fan Zhang
beef67ec74
Add strings to support multi-state vivid color management
...
am: a12b3d318d
2017-10-27 00:08:51 +00:00
Bill Yi
ac8f283a8a
Import translations. DO NOT MERGE
...
am: 68d7f87f78
2017-10-27 00:08:39 +00:00
Romain Guy
298adb9b54
Add new color mode setting
...
am: 9143fb26b4
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
Qi Ding
4ca4bd31c3
Fix current tab is changed when rotating device
...
Even if SIM slot 2 is selected in SIM card lock settings,
the current tab is changed to SIM slot 1 when rotating the device.
To fix this issue, the current tab should be restored
after rotating the device.
Fixes: 63690125
Test: manual - go to Settings > Security > SIM card lock
and rotate device
Change-Id: I874d4d06019e21dd7b65951a3aefb75ff5ea298b
2017-10-26 14:39:03 +09:00
Christine Franks
7f3176aceb
DO NOT MERGE - Move color mode to DisplayTransformManager
...
am: cd2b7aea5f
2017-10-25 20:23:06 +00: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
c892a3cfc9
Merge "Add new color mode setting" into oc-mr1-dev
...
am: 94aa05059d
2017-10-25 04:38:57 +00: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
17a1b4e1fc
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: aa8a972ea3
...
am: 2ef76cb0d2
2017-10-24 20:42:12 +00:00
Fan Zhang
614f7aafdc
Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29
...
am: e373209b97
2017-10-24 20:41:16 +00:00
