Fan Zhang
e1971f99b8
Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev am: 14244ffb9d
...
am: 24267b2e93
2018-04-06 11:07:31 -07:00
Fan Zhang
24267b2e93
Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev
...
am: 14244ffb9d
2018-04-06 10:51:42 -07:00
Daniel Solomon
7f2ae90df2
Merge "Disable user control of color mode depending on Accessibility" into pi-dev am: c9bd31b2f8
...
am: c04f722cab
2018-04-06 10:48:49 -07:00
Daniel Solomon
c04f722cab
Merge "Disable user control of color mode depending on Accessibility" into pi-dev
...
am: c9bd31b2f8
2018-04-06 10:41:28 -07:00
TreeHugger Robot
14244ffb9d
Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev
2018-04-06 17:15:46 +00:00
TreeHugger Robot
c9bd31b2f8
Merge "Disable user control of color mode depending on Accessibility" into pi-dev
2018-04-06 17:12:01 +00:00
Tony Mak
71b078d636
Merge "apostrophe should be curly" into pi-dev am: 7a5e97e10f
...
am: 4ccd4cb98c
2018-04-06 09:51:18 -07:00
Tony Mak
4ccd4cb98c
Merge "apostrophe should be curly" into pi-dev
...
am: 7a5e97e10f
2018-04-06 09:44:43 -07:00
TreeHugger Robot
7a5e97e10f
Merge "apostrophe should be curly" into pi-dev
2018-04-06 16:32:35 +00:00
Andreas Terzis
e978d3dae0
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev am: c91339b3ce
...
am: 151f765339
2018-04-05 17:36:34 -07:00
ryanywlin
ee03999ad3
Merge "Add new string for sound settings" into pi-dev am: ac119ae807
...
am: 7eb22b055f
2018-04-05 17:34:27 -07:00
Andreas Terzis
151f765339
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
...
am: c91339b3ce
2018-04-05 17:16:19 -07:00
ryanywlin
7eb22b055f
Merge "Add new string for sound settings" into pi-dev
...
am: ac119ae807
2018-04-05 17:14:35 -07:00
TreeHugger Robot
c91339b3ce
Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
2018-04-05 23:41:47 +00:00
Bill Yi
1e7039de9d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3da184f074 -s ours
...
am: 32cab7934a
2018-04-05 16:35:26 -07:00
TreeHugger Robot
ac119ae807
Merge "Add new string for sound settings" into pi-dev
2018-04-05 23:33:40 +00:00
Jan Nordqvist
087b5797ed
Merge "Change "X over" text color to ColorError" into pi-dev am: 22bf690fdd
...
am: b2a8860b3c
2018-04-05 16:31:40 -07:00
Bill Yi
32cab7934a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 3da184f074
2018-04-05 16:24:00 -07:00
TreeHugger Robot
3da184f074
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-05 23:12:21 +00:00
Jan Nordqvist
b2a8860b3c
Merge "Change "X over" text color to ColorError" into pi-dev
...
am: 22bf690fdd
2018-04-05 16:11:16 -07:00
TreeHugger Robot
22bf690fdd
Merge "Change "X over" text color to ColorError" into pi-dev
2018-04-05 22:47:23 +00:00
Salvador Martinez
fb2990ac8a
Merge "Update WifiScanningRequiredFragment dialog to show help page" into pi-dev am: 148af6ba16
...
am: 6ae3fbb4c9
2018-04-05 15:43:07 -07:00
Andreas Terzis
903a92535a
"Data Warn & Limits" pref. summary should be empty.
...
The "Data Warning & Limits" preference in the Data Usage screen
should not have a summary.
Bug: 77300376
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ic567e7451ac3ea102577ab96ccef3ce7de05d4ad
2018-04-05 15:22:31 -07:00
Salvador Martinez
6ae3fbb4c9
Merge "Update WifiScanningRequiredFragment dialog to show help page" into pi-dev
...
am: 148af6ba16
2018-04-05 15:20:05 -07:00
Jan Nordqvist
0c36260db1
Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev am: 3f59ce67b6
...
am: eff9d43739
2018-04-05 15:18:18 -07:00
Lei Yu
537dcf8cb1
Merge "Update the anomaly type constants" into pi-dev am: 2c8a78a97c
...
am: 59b393ec4a
2018-04-05 15:17:32 -07:00
TreeHugger Robot
148af6ba16
Merge "Update WifiScanningRequiredFragment dialog to show help page" into pi-dev
2018-04-05 22:07:30 +00:00
Jan Nordqvist
eff9d43739
Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev
...
am: 3f59ce67b6
2018-04-05 14:54:51 -07:00
Bill Yi
574ac6b054
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 31d1b214ce -s ours
...
am: d8f7641fa1
2018-04-05 14:54:32 -07:00
Lei Yu
59b393ec4a
Merge "Update the anomaly type constants" into pi-dev
...
am: 2c8a78a97c
2018-04-05 14:54:08 -07:00
Doris Ling
4e56ff5628
Merge "Update launch intent flags for settings shortcut widgets." into pi-dev am: 40d411abf5
...
am: c9b7f8a008
2018-04-05 14:43:39 -07:00
Bill Yi
d8f7641fa1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 31d1b214ce
2018-04-05 14:39:33 -07:00
TreeHugger Robot
3f59ce67b6
Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev
2018-04-05 21:36:59 +00:00
Bill Yi
494e7989ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I08041a5d5d29533296012921a6d53956948ad527
2018-04-05 14:34:11 -07:00
Doris Ling
c9b7f8a008
Merge "Update launch intent flags for settings shortcut widgets." into pi-dev
...
am: 40d411abf5
2018-04-05 14:32:21 -07:00
TreeHugger Robot
2c8a78a97c
Merge "Update the anomaly type constants" into pi-dev
2018-04-05 21:23:24 +00:00
TreeHugger Robot
31d1b214ce
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-05 21:02:51 +00:00
Fan Zhang
79cd7986e5
Update SliceContollerInXmlTest to match latest slice spec.
...
- Convert the test to use CodeInspector
- Skip abstract classes when validating contract
- Also check SliderPreferenceController when validating contract
Change-Id: I671c1a622df6d1d7248a12932f144711fbf5a026
Fixes: 77634230
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CodeIns
2018-04-05 13:56:07 -07:00
TreeHugger Robot
40d411abf5
Merge "Update launch intent flags for settings shortcut widgets." into pi-dev
2018-04-05 20:50:06 +00:00
Salvador Martinez
0768f15470
Update WifiScanningRequiredFragment dialog to show help page
...
This CL updates the WifiScanningRequiredFragment dialog so that the
learn more button is only shown when a help page is available.
Additionally, we add the metrics constant for the dialog.
Test: robotests
Bug: 67070896
Change-Id: I7697c88b5969edaf5c06eb33251f215b776c64ee
2018-04-05 13:34:03 -07:00
Jan Nordqvist
f957c64367
[automerger skipped] Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev am: 220a6a002e
...
am: d19ca38ebb
2018-04-05 13:22:52 -07:00
Jan Nordqvist
bdd559a181
Do not use warning or limit to display "X B left" above usage bar
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I46f4f5f1cf6092038e49beaafe5aa6a19ffb0aa1
2018-04-05 13:22:06 -07:00
Felipe Leme
d5f0a6a267
Merge "Couple more Scoped Directory Access changes." into pi-dev am: 963a4fb59e
...
am: feffcc9c10
2018-04-05 13:12:03 -07:00
Jan Nordqvist
d19ca38ebb
Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev
...
am: 220a6a002e
2018-04-05 13:09:43 -07:00
TreeHugger Robot
220a6a002e
Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev
2018-04-05 19:59:00 +00:00
Bill Yi
41106de196
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2be2f8d5061e7b01fd97170d861d68980db9e665
2018-04-05 12:33:14 -07:00
Felipe Leme
feffcc9c10
Merge "Couple more Scoped Directory Access changes." into pi-dev
...
am: 963a4fb59e
2018-04-05 12:26:41 -07:00
TreeHugger Robot
963a4fb59e
Merge "Couple more Scoped Directory Access changes." into pi-dev
2018-04-05 19:02:11 +00:00
Lei Yu
9f2a9e431d
Merge "Show Battery saver tip when battery saver is on" into pi-dev am: 197be04330
...
am: 16a0fcc6c3
2018-04-05 11:49:04 -07:00
Lei Yu
7b13eaf133
Merge "Fix crash in Monkey test." into pi-dev am: d95668db99
...
am: 85f6fd4a1f
2018-04-05 11:40:23 -07:00
