ryanywlin
d1a6a71567
Merge "Add new string for audio switcher" into pi-dev am: 09793d19d3
...
am: 532ec3c9bd
2018-04-09 22:43:41 -07:00
ryanywlin
532ec3c9bd
Merge "Add new string for audio switcher" into pi-dev
...
am: 09793d19d3
2018-04-09 21:34:40 -07:00
TreeHugger Robot
09793d19d3
Merge "Add new string for audio switcher" into pi-dev
2018-04-10 04:24:16 +00:00
Doris Ling
2add0178ce
Fix robotest failure for ChartDataUsagePreferenceTest. am: c8613c7930
...
am: a98c2cfdf1
2018-04-09 21:23:44 -07:00
Doris Ling
a98c2cfdf1
Fix robotest failure for ChartDataUsagePreferenceTest.
...
am: c8613c7930
2018-04-09 20:52:40 -07:00
Jeff Sharkey
0a77d9035b
Merge "Update storage wizard to latest UX mocks." into pi-dev am: e9b6d482cb
...
am: 2388fe48b5
2018-04-09 19:28:22 -07:00
Salvador Martinez
58fc3deab2
Merge "Make it possible to have open tether network" into pi-dev am: b410c21a01
...
am: 0cbce4983f
2018-04-09 19:27:48 -07:00
Jeff Sharkey
2388fe48b5
Merge "Update storage wizard to latest UX mocks." into pi-dev
...
am: e9b6d482cb
2018-04-09 18:24:53 -07:00
Salvador Martinez
0cbce4983f
Merge "Make it possible to have open tether network" into pi-dev
...
am: b410c21a01
2018-04-09 18:24:11 -07:00
Doris Ling
c8613c7930
Fix robotest failure for ChartDataUsagePreferenceTest.
...
- the chart usage data is computed using difference between current time
and the timestamp from the usage data. In the test, we are using actual
current time and mock usage data. As the current time varies the test
computating sometimes results in some negative data, and makes the
comparison unpredictable. Change to use a fix "current" time in the test
so that the time difference in computation will be constant.
Fixes: 77824818
Test: make RunSettingsRoboTests
Change-Id: I2d8c166839775469d30015317afdc04eb3d9a2b4
2018-04-09 18:12:46 -07:00
Jeff Sharkey
e9b6d482cb
Merge "Update storage wizard to latest UX mocks." into pi-dev
2018-04-09 23:58:34 +00:00
TreeHugger Robot
679799dd1b
Merge "Fix usb preference summary"
2018-04-09 23:47:53 +00:00
Salvador Martinez
b410c21a01
Merge "Make it possible to have open tether network" into pi-dev
2018-04-09 23:30:35 +00:00
Christine Franks
036cf51ac4
Merge "Remove Automatic color mode option" into pi-dev am: 0c92430be4
...
am: 00606b5d2a
2018-04-09 14:44:56 -07:00
Hansong Zhang
b2924dec8a
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9 am: e934ea80a6 am: 7df9791d24
...
am: 148d04dedb
2018-04-09 14:43:44 -07:00
Hansong Zhang
bba13e58c2
[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07 am: af077f8d4c -s ours am: 3369767245
...
am: 9b8c565932
2018-04-09 14:41:01 -07:00
Christine Franks
00606b5d2a
Merge "Remove Automatic color mode option" into pi-dev
...
am: 0c92430be4
2018-04-09 14:29:33 -07:00
Hansong Zhang
148d04dedb
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9 am: e934ea80a6
...
am: 7df9791d24
2018-04-09 14:26:49 -07:00
Hansong Zhang
9b8c565932
[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07 am: af077f8d4c -s ours
...
am: 3369767245
2018-04-09 14:25:07 -07:00
Christine Franks
0c92430be4
Merge "Remove Automatic color mode option" into pi-dev
2018-04-09 21:18:28 +00:00
Hansong Zhang
7df9791d24
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9
...
am: e934ea80a6
2018-04-09 14:10:21 -07:00
Hansong Zhang
3369767245
[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07
...
am: af077f8d4c
2018-04-09 14:08:48 -07:00
Makoto Onuki
9d9a79bb6c
Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev am: 8064782d77
...
am: 24287ce1e1
2018-04-09 13:57:29 -07:00
Hansong Zhang
e934ea80a6
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae
...
am: 3f2dbb7cc9
2018-04-09 13:54:58 -07:00
Hansong Zhang
af077f8d4c
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4
...
am: 1b7566cd07
2018-04-09 13:53:41 -07:00
Jerry Zhang
9d6aba32cb
Fix usb preference summary
...
In host mode, summary should not display
function info.
Bug: 77647931
Test: passes
Change-Id: Ic15849e12aa47df75cc75c9da0384e24627a9c8b
2018-04-09 13:52:43 -07:00
Makoto Onuki
24287ce1e1
Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev
...
am: 8064782d77
2018-04-09 13:46:52 -07:00
Hansong Zhang
3f2dbb7cc9
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
...
am: d59b0eddae
2018-04-09 13:44:07 -07:00
Hansong Zhang
1b7566cd07
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6
...
am: c4127072f4
2018-04-09 13:43:04 -07:00
TreeHugger Robot
d59b0eddae
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
...
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afae25ebddfdcee220e02387b2b84c617b1f00ebf9c4f58c19afae25ebddfdcee220e02387b2b84c6174f58c19afae25ebddfdcee220e02384f58c19afae25ebddfdc4f58c19afa
2018-04-09 20:29:54 +00:00
Makoto Onuki
8064782d77
Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev
2018-04-09 20:29:30 +00:00
Beverly Tai
890283719a
Merge "Update DndCondition settings summary" into pi-dev am: 9fc72be6c8
...
am: 3153a0e540
2018-04-09 13:18:48 -07:00
Beverly Tai
3153a0e540
Merge "Update DndCondition settings summary" into pi-dev
...
am: 9fc72be6c8
2018-04-09 13:08:02 -07:00
Beverly Tai
9fc72be6c8
Merge "Update DndCondition settings summary" into pi-dev
2018-04-09 19:54:24 +00:00
Jerry Zhang
dd3db23f18
Merge "Remove gear from usb preference" into pi-dev am: 631ee514ae
...
am: ba04287724
2018-04-09 12:54:19 -07:00
Fan Zhang
c7e36d940d
Merge "Use proper icon size for default app prefs." into pi-dev am: 968dcaf41a
...
am: d45b7cbe40
2018-04-09 12:45:56 -07:00
Jerry Zhang
ba04287724
Merge "Remove gear from usb preference" into pi-dev
...
am: 631ee514ae
2018-04-09 12:36:12 -07:00
HJ ChangLiao
47a64c8c33
[automerger skipped] Merge "GesturesSettingPreferenceController to Toggle" into pi-dev am: 283ac08e86
...
am: c10ae96139
2018-04-09 12:27:07 -07:00
Fan Zhang
d45b7cbe40
Merge "Use proper icon size for default app prefs." into pi-dev
...
am: 968dcaf41a
2018-04-09 12:27:02 -07:00
Julia Reynolds
65fe2137d8
Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
...
am: 2b5d069d4b
2018-04-09 12:18:36 -07:00
HJ ChangLiao
c10ae96139
Merge "GesturesSettingPreferenceController to Toggle" into pi-dev
...
am: 283ac08e86
2018-04-09 12:14:53 -07:00
Julia Reynolds
2b5d069d4b
Merge "Reorder visual effect fields" into pi-dev
...
am: b90e5aff53
2018-04-09 12:10:53 -07:00
TreeHugger Robot
631ee514ae
Merge "Remove gear from usb preference" into pi-dev
2018-04-09 19:08:26 +00:00
Daniel Nishi
df2b3c6d18
Merge "Fix a crash in Storage Settings." into pi-dev am: 4264653952
...
am: 2e9e429741
2018-04-09 12:06:46 -07:00
TreeHugger Robot
968dcaf41a
Merge "Use proper icon size for default app prefs." into pi-dev
2018-04-09 19:04:22 +00:00
TreeHugger Robot
283ac08e86
Merge "GesturesSettingPreferenceController to Toggle" into pi-dev
2018-04-09 18:59:44 +00:00
Daniel Nishi
2e9e429741
Merge "Fix a crash in Storage Settings." into pi-dev
...
am: 4264653952
2018-04-09 11:54:44 -07:00
TreeHugger Robot
b90e5aff53
Merge "Reorder visual effect fields" into pi-dev
2018-04-09 18:52:25 +00:00
TreeHugger Robot
4264653952
Merge "Fix a crash in Storage Settings." into pi-dev
2018-04-09 18:40:40 +00:00
Salvador Martinez
670a3e582f
Make it possible to have open tether network
...
Previously people could have open tether networks but a restrction
was placed on this sometime in the past. However there is no migration
plan in place for people with open tether networks which will cause
problems when the new requirements are enforced. This CL makes it
so tether networks can be open once more.
Test: robotests
Bug: 65784990
Change-Id: I6e350dd53b9b9f987dd5a4cc317ba18d7f50df79
2018-04-09 11:30:37 -07:00
