Salvador Martinez
0b889da802
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
...
am: 4eeb88ab8a
2018-04-10 15:22:13 -07:00
Beverly
752824221d
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
...
am: 45fe0bb6a0
2018-04-10 15:18:51 -07:00
Patrick Baumann
f575445171
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
...
am: 0c532181ab
2018-04-10 15:17:41 -07:00
TreeHugger Robot
4eeb88ab8a
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
2018-04-10 22:16:35 +00:00
TreeHugger Robot
45fe0bb6a0
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
2018-04-10 22:09:34 +00:00
TreeHugger Robot
0c532181ab
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
2018-04-10 22:00:34 +00:00
Lei Yu
de4199e3db
Merge "Add test flags for battery tips." into pi-dev
...
am: 93ff833316
2018-04-10 14:02:10 -07:00
Lei Yu
93ff833316
Merge "Add test flags for battery tips." into pi-dev
2018-04-10 20:44:11 +00:00
Matthew Fritze
ea52f72840
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
...
am: 3ec0e4851c
2018-04-10 12:38:28 -07:00
TreeHugger Robot
3ec0e4851c
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
2018-04-10 19:31:03 +00:00
Beverly
7b09d2cebb
Set parent for auto zen rules to be zen rule page
...
Clicking the back button on an automatic zen rule
will now go back to the automatic rule page instead
of the generic Settings page
Change-Id: I5902e01b641ec3e4d0c8b4b4a5b16a0385cbd0ff
Fixes: 77833624
Test: manual
2018-04-10 15:28:17 -04:00
Lei Yu
1b82df6906
Merge "Hide preference when no app restricted" into pi-dev
...
am: 1f02712e7a
2018-04-10 12:03:56 -07:00
TreeHugger Robot
1f02712e7a
Merge "Hide preference when no app restricted" into pi-dev
2018-04-10 18:30:26 +00:00
Daniel Solomon
c767f493d8
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
...
am: e96b57a5fb
2018-04-10 11:02:04 -07:00
Lei Yu
44f6508070
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev
...
am: fa447e698d
2018-04-10 10:59:59 -07:00
Daniel Solomon
e96b57a5fb
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
2018-04-10 17:59:26 +00:00
Lei Yu
fa447e698d
Merge "Update field for ACTION_ANOMALY_TRIGGERED" into pi-dev
2018-04-10 17:39:08 +00:00
Jason Monk
fd1be7d153
Merge "Update slice constant reference" into pi-dev
...
am: 5a974c6335
2018-04-10 10:21:21 -07:00
Jason Monk
5a974c6335
Merge "Update slice constant reference" into pi-dev
2018-04-10 17:10:29 +00:00
Jason Monk
9b555bf515
Update slice constant reference
...
Test: build
Bug: 73123786
Change-Id: I9f38f0298bcaace85256639fd285d38a580c90fe
2018-04-10 10:56:32 -04:00
Julia Reynolds
a87381e9a8
Merge "Add zen onboarding screen" into pi-dev
...
am: 34a593db65
2018-04-10 07:50:30 -07:00
TreeHugger Robot
34a593db65
Merge "Add zen onboarding screen" into pi-dev
2018-04-10 14:35:44 +00:00
Julia Reynolds
88fa6fd0fb
Merge "Notification settings updates" into pi-dev
...
am: d7a1c39694
2018-04-10 07:01:53 -07:00
TreeHugger Robot
d7a1c39694
Merge "Notification settings updates" into pi-dev
2018-04-10 13:51:22 +00:00
Julia Reynolds
4b8fe09d72
Add zen onboarding screen
...
Bug: 77658931
Test: make -j RunSettingsRoboTests
Change-Id: Ifc886148ed742d72b5606a9ce7eb19d0da234c9e
2018-04-10 08:53:09 -04: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
a98c2cfdf1
Fix robotest failure for ChartDataUsagePreferenceTest.
...
am: c8613c7930
2018-04-09 20:52:40 -07:00
Daniel Solomon
fbe8a1318b
Hide color mode preference depending on Accessibility settings
...
Currently, when certain Accessibility color transforms are enabled, the
color mode preference radio buttons are disabled. To avoid confusing
users, hide the color mode preference entirely. If the color mode
settings screen is already open when the Accessibility transforms are
enabled, return the user back to the previous screen.
Bug: 77695840
Test: make ROBOTEST_FILTER=ColorModePreferenceFragmentTest
RunSettingsRoboTests -j40
Change-Id: I44812713bdc739b843e5806711d25ea950aa6250
2018-04-09 20:49:43 -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
Matthew Fritze
dba7d1c4b3
Unavailable Slices includes DISABLED_DEPENDENT settings
...
In the change to mark disabled_dependent as available,
it did not change the check in SliceBuilderUtils for the
unavailable Slices. In the case of DISABLED_DEPENDENT, the
setting is available but the Slice is not.
Though it is a simple change, we can now properly test the contents
of Slices, so this change includes tests which should have been in
place earlier and would have caught this bug - duh.
Bug: 71640747
Test: Robotests
Change-Id: I8db5bc80edb337cbf907ce3669aa2bfd9c72f74a
2018-04-09 17:06:47 -07:00
Jeff Sharkey
e9b6d482cb
Merge "Update storage wizard to latest UX mocks." into pi-dev
2018-04-09 23:58:34 +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
Salvador Martinez
81ca3dd4c0
Remove provisioning dialog from wifi-tethering
...
We no longer want this dialog to show when a user toggles tethering.
Failures to set up the AP will still be handled correctly.
Test: robotests pass
Bug: 62629055
Change-Id: Id3d0bf9694a1c8b6ae353bfd6634dd0b56813497
2018-04-09 15:27:02 -07:00
Lei Yu
c7b58b6997
Update field for ACTION_ANOMALY_TRIGGERED
...
Use new field FIELD_ANOMALY_TYPE
Bug: 75976625
Test: RunSettingsRoboTests
Change-Id: Ifb67c687d25e1e35afaadb05f2e9883e8dcf8049
2018-04-09 15:22:19 -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
Julia Reynolds
d7815fe18f
Notification settings updates
...
- smaller icons
- text update
- fx header
- fix category header
Test: make -j RunSettingsRoboTests
Change-Id: If822d6db31a8dccf20ee88182cda1aee34aa7675
Fixes: 77325154
Fixes: 77323406
Fixes: 77324677
Fixes: 74408368
2018-04-09 17:24:09 -04: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
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
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
