Andrew Sapperstein
823cd12415
Update inherited actionBarStyle to DeviceDefault.
...
Was using a Material style. Now it's using the DeviceDefault one that
Theme.DeviceDefault.Settings uses.
Bug: 69314526
Test: visual inspection
Change-Id: I5ce1bbb51a8d067fce226ff4a41fdea64106156a
2018-04-08 12:33:27 -07:00
Andrew Sapperstein
4bd3007865
Delete unused query_hint_text string.
...
Change-Id: If6378768255c7cac290f914620115bff04c6b281
Fixes: 77772047
Test: compiles
2018-04-08 11:15:03 -07:00
Erik Kline
ef12e2f84e
Merge "Fix test expectations for NetworkCallbacks" into pi-dev am: 47c2eebc85
...
am: 3d6d43663e
2018-04-06 22:30:15 -07:00
Erik Kline
3d6d43663e
Merge "Fix test expectations for NetworkCallbacks" into pi-dev
...
am: 47c2eebc85
2018-04-06 22:19:21 -07:00
TreeHugger Robot
47c2eebc85
Merge "Fix test expectations for NetworkCallbacks" into pi-dev
2018-04-07 05:06:53 +00:00
Fan Zhang
5bb34f2782
[automerger skipped] Merge "Create help link placeholder for Wifi Direct settings." into pi-dev am: aeb33b72b3
...
am: 8d3068bf3b
2018-04-06 18:20:23 -07:00
Fan Zhang
8d3068bf3b
Merge "Create help link placeholder for Wifi Direct settings." into pi-dev
...
am: aeb33b72b3
2018-04-06 18:12:21 -07:00
TreeHugger Robot
aeb33b72b3
Merge "Create help link placeholder for Wifi Direct settings." into pi-dev
2018-04-07 01:04:52 +00:00
Christine Franks
91490d4cd9
Remove Automatic color mode option
...
This is not yet implemented and should not appear as an option.
Bug: 76420446
Test: make RunSettingsRoboTests -j100
Change-Id: I40f1f48cc93417536a1680923c7628139a0534b1
2018-04-06 17:41:57 -07:00
Doris Ling
ac2b789826
Merge "Adjust alignment for suggestion icon." into pi-dev am: 2d925f45b2
...
am: 137dcb6998
2018-04-06 16:37:03 -07:00
Bill Yi
abdcff575f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: cd986c2c38 -s ours
...
am: 11c27313e6
2018-04-06 16:34:49 -07:00
Matthew Fritze
67bf80c9ab
Merge "Prioritize dynamic summaries" into pi-dev am: c29aec4bde
...
am: bd4ba55cac
2018-04-06 16:27:35 -07:00
Doris Ling
137dcb6998
Merge "Adjust alignment for suggestion icon." into pi-dev
...
am: 2d925f45b2
2018-04-06 16:11:48 -07:00
Fan Zhang
0cd2ccfe30
Create help link placeholder for Wifi Direct settings.
...
Change-Id: Ia22259d191d2663d7ef63438c680826d3fd590fb
Merged-In: Ia22259d191d2663d7ef63438c680826d3fd590fb
Fixes: 70854725
Test: robotests
2018-04-06 23:06:36 +00:00
Doris Ling
2d925f45b2
Merge "Adjust alignment for suggestion icon." into pi-dev
2018-04-06 23:00:30 +00:00
TreeHugger Robot
0391597948
Merge "Create help link placeholder for Wifi Direct settings."
2018-04-06 22:58:31 +00:00
Lei Yu
c5f5b18b22
Add NullPtrCheck when smearing in settings
...
This only happens in new device with broken power_profile.xml, in
which it doesn't have screen power model.
This CL catches the null pointer crash and log it.
Change-Id: Iac23e3a8fc51385bdb22979c4b59000319f6fd49
Fixes: 74617269
Test: RunSettingsRoboTests
2018-04-06 15:57:44 -07:00
Bill Yi
11c27313e6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: cd986c2c38
2018-04-06 15:54:50 -07:00
Matthew Fritze
bd4ba55cac
Merge "Prioritize dynamic summaries" into pi-dev
...
am: c29aec4bde
2018-04-06 15:52:40 -07:00
TreeHugger Robot
cd986c2c38
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-06 22:42:17 +00:00
TreeHugger Robot
c29aec4bde
Merge "Prioritize dynamic summaries" into pi-dev
2018-04-06 22:29:02 +00:00
Julia Reynolds
61478b7049
Merge "Make volume sliders sliceable" into pi-dev am: 4ef7b5f97b
...
am: 3fa5b4fad4
2018-04-06 15:09:22 -07:00
Fan Zhang
1deac101a0
Create help link placeholder for Wifi Direct settings.
...
Change-Id: Ia22259d191d2663d7ef63438c680826d3fd590fb
Bug: 70854725
Test: robotests
2018-04-06 22:00:10 +00:00
Mehdi Alizadeh
a220a524fa
Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev am: 3ac16896b9
...
am: 3e2897b6cd
2018-04-06 14:57:22 -07:00
Doris Ling
08908b2b20
Adjust alignment for suggestion icon.
...
- add margin to the suggestion icon so that it align properly with the
suggestion text.
- also align the action button with the suggestion icon and text.
Change-Id: Ic12e4160d6583cf2d837e65ee5fd5a1ad73d348d
Fixes: 74414989
Test: visual
2018-04-06 14:56:07 -07:00
Lei Yu
4afd56362a
Merge "Add test for anomaly detection in P" into pi-dev am: e0864a030f
...
am: 84b0cbc3ee
2018-04-06 14:51:06 -07:00
Julia Reynolds
3fa5b4fad4
Merge "Make volume sliders sliceable" into pi-dev
...
am: 4ef7b5f97b
2018-04-06 14:43:27 -07:00
Lei Yu
21bde3afe4
Add test flags for battery tips.
...
When this flag is true, we will show related battery tip by force.
Then we can manually test and verify the UI behavior.
Following CL will add test flag for "app restriction" since it is
a little tricky.
Bug: 77477035
Test: RunSettingsRoboTests
Change-Id: Ib12ff4aa8bcc998ea6a73f461c3d5f7fcc39b019
2018-04-06 14:43:02 -07:00
Mehdi Alizadeh
3e2897b6cd
Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev
...
am: 3ac16896b9
2018-04-06 14:37:59 -07:00
Lei Yu
84b0cbc3ee
Merge "Add test for anomaly detection in P" into pi-dev
...
am: e0864a030f
2018-04-06 14:30:43 -07:00
Matthew Fritze
8db4358f76
Prioritize dynamic summaries
...
If both Xml and a controller provide a summary,
the controller's should be prioritized.
Change-Id: I030746b0f253ce4884a7868e385069b208f63082
Fixes: 77602860
Test: robotests
2018-04-06 14:11:50 -07:00
Erik Kline
fabbd1730c
Fix test expectations for NetworkCallbacks
...
Test: as follows
- built
- flashed
- booted
- make -j50 RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Bug: 64133961
Bug: 77285360
Change-Id: I1ada2888d0c5517f3bcde646bf8efab331330cfd
2018-04-06 14:10:30 -07:00
Nicolas Geoffray
761c47628b
Merge "Exempt tests from hidden API checks." into pi-dev am: 8838b3fa9c
...
am: b3ef209fc6
2018-04-06 14:00:39 -07:00
arangelov
9993ea833a
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev am: 22a12c0ea2
...
am: a739a63880
2018-04-06 13:59:46 -07:00
Lei Yu
ebb18819b7
Merge "Add battery illustration" into pi-dev am: 3035d45a8f
...
am: 0c43bd4c36
2018-04-06 13:51:07 -07:00
Lei Yu
2678c6e34a
Merge "Add name and icon for AOD" into pi-dev am: f9cea645e1
...
am: 17c2906404
2018-04-06 13:48:32 -07:00
Julia Reynolds
4ef7b5f97b
Merge "Make volume sliders sliceable" into pi-dev
2018-04-06 20:48:31 +00:00
Mehdi Alizadeh
3ac16896b9
Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev
2018-04-06 20:46:18 +00:00
TreeHugger Robot
e0864a030f
Merge "Add test for anomaly detection in P" into pi-dev
2018-04-06 20:46:00 +00:00
Mehdi Alizadeh
00a2b83bf9
Adds strings for Swipe Up gesture in Settings
...
Bug: 77549883
Test: None
Change-Id: I64b448f3a3564e8ac6d29e1241e84032708dba71
2018-04-06 20:43:43 +00:00
Nicolas Geoffray
b3ef209fc6
Merge "Exempt tests from hidden API checks." into pi-dev
...
am: 8838b3fa9c
2018-04-06 13:41:53 -07:00
arangelov
a739a63880
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev
...
am: 22a12c0ea2
2018-04-06 13:41:21 -07:00
TreeHugger Robot
8838b3fa9c
Merge "Exempt tests from hidden API checks." into pi-dev
2018-04-06 20:39:24 +00:00
Lei Yu
0c43bd4c36
Merge "Add battery illustration" into pi-dev
...
am: 3035d45a8f
2018-04-06 13:38:10 -07:00
TreeHugger Robot
22a12c0ea2
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev
2018-04-06 20:35:41 +00:00
Lei Yu
17c2906404
Merge "Add name and icon for AOD" into pi-dev
...
am: f9cea645e1
2018-04-06 13:35:31 -07:00
TreeHugger Robot
3035d45a8f
Merge "Add battery illustration" into pi-dev
2018-04-06 20:26:24 +00:00
TreeHugger Robot
f9cea645e1
Merge "Add name and icon for AOD" into pi-dev
2018-04-06 20:19:21 +00:00
Lei Yu
9783a7c2ac
Merge "Add anomaly log to dumpsys" into pi-dev am: 4becdc6fbe
...
am: 7556fc543c
2018-04-06 12:57:37 -07:00
Lei Yu
7556fc543c
Merge "Add anomaly log to dumpsys" into pi-dev
...
am: 4becdc6fbe
2018-04-06 12:37:26 -07:00
