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
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
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
Bill Yi
2ef76cb0d2
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: aa8a972ea3
2017-10-24 20:33:44 +00:00
Fan Zhang
e373209b97
Merge "Fix wrong position of cursor in OwnerInfoSettings"
...
am: 2bcbc35b29
2017-10-24 20:33:03 +00:00
Bill Yi
18fea4f0c3
Import translations. DO NOT MERGE
...
am: 66ecad49ba
2017-10-24 20:03:09 +00:00
Bill Yi
aa8a972ea3
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
2017-10-24 11:32:26 -07:00
Fan Zhang
2bcbc35b29
Merge "Fix wrong position of cursor in OwnerInfoSettings"
2017-10-24 18:13:25 +00: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
tiansiming
7206a2998d
Fix wrong position of cursor in OwnerInfoSettings
...
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-10-24 17:19:27 +08:00
Rajeev Kumar
ac0fd76521
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
...
am: dd8e66fa20
2017-10-24 05:01:49 +00: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
bb6efe3743
Add strings to support multi-state vivid color management
...
am: e1543a3895
2017-10-24 00:27:02 +00: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
Jack Yu
71beadce17
Merge "Refactored area update info support" am: 60d6ffbc6c am: 3966912efa
...
am: d4ef8eca27
2017-10-20 19:52:40 +00:00
Jack Yu
d4ef8eca27
Merge "Refactored area update info support" am: 60d6ffbc6c
...
am: 3966912efa
2017-10-20 19:41:05 +00:00
Jack Yu
3966912efa
Merge "Refactored area update info support"
...
am: 60d6ffbc6c
2017-10-20 19:30:29 +00:00
Treehugger Robot
60d6ffbc6c
Merge "Refactored area update info support"
2017-10-20 19:19:09 +00:00
Bill Yi
7a20f4a206
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a5d652c89f -s ours
...
am: 8313368b32
2017-10-20 17:15:14 +00:00
Bill Yi
8313368b32
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: a5d652c89f
2017-10-20 16:47:03 +00:00
Ben Schwartz
2372074d57
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
...
am: 1fd46833ef
2017-10-20 15:33:50 +00:00
TreeHugger Robot
a5d652c89f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:28:33 +00:00
Ben Schwartz
1fd46833ef
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
...
am: ed97eaeb4a
2017-10-20 15:15:14 +00:00
Ben Schwartz
ed97eaeb4a
Merge "Add a developer option for controlling DNS over TLS"
...
am: c8207de343
2017-10-20 15:06:10 +00:00
Treehugger Robot
c8207de343
Merge "Add a developer option for controlling DNS over TLS"
2017-10-20 14:58:39 +00:00
Bill Yi
074e2ee9ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
2017-10-20 03:21:50 -07:00
Jack Yu
2f010230df
Refactored area update info support
...
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit c3cab8ecb8
2017-10-19 17:36:33 -07:00
tiansiming
cca755cfac
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43
...
am: ecf2bdb46f
2017-10-19 19:24:53 +00:00
tiansiming
ecf2bdb46f
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
...
am: 92e77cbd43
2017-10-19 19:22:16 +00:00
tiansiming
92e77cbd43
Merge "Fix wrong position of cursor in IccLockSettings"
...
am: 3a3044eeef
2017-10-19 19:20:09 +00:00
Treehugger Robot
3a3044eeef
Merge "Fix wrong position of cursor in IccLockSettings"
2017-10-19 19:14:49 +00:00
tiansiming
64f48b5ce6
Fix wrong position of cursor in IccLockSettings
...
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-10-20 01:26:40 +08:00
Jeff Sharkey
937ede14d8
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
...
am: 1dcb8522fa
2017-10-18 22:55:51 +00:00
Jeff Sharkey
9220dda5b8
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
...
am: 1e23fc8814
2017-10-18 22:54:01 +00:00
Jeff Sharkey
0f1d957bb3
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
...
am: 6b56423651
2017-10-18 22:27:47 +00:00
Jeff Sharkey
b5f7753e18
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
...
am: e39f0c21f9
2017-10-18 22:26:30 +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
2017-10-18 21:52:46 +00:00
