John Reck
ae7a241ee7
Merge "Remove obsolete development setting"
2018-03-08 01:28:10 +00:00
John Reck
fcaf80e8c5
Remove obsolete development setting
...
Remove the "Force GPU Rendering" option. Nobody is testing
their pre-honeycomb apps anymore, so this setting has outlived
its usefulness.
Test: builds
Change-Id: I8780db1de4e178b4c99936b274576d743e7f6438
2018-03-08 01:12:35 +00:00
TreeHugger Robot
9223f39aa3
Merge "Remove unused file res/layout/usb_dialog_container.xml"
2018-03-08 00:36:05 +00:00
Fan Zhang
1cdfb4ca09
Merge "Clean up comment" into pi-dev am: 12a8fced66
...
am: d68b9830cf
Change-Id: I1693bf310f316f134b4c87cf382e20bcba434ca3
2018-03-08 00:08:33 +00:00
Fan Zhang
931e99e032
Merge "Update string: clear data -> clear storage" into pi-dev am: ad24c98c2d
...
am: 3c5196a5de
Change-Id: I94ec15bf738140e67549c8fd01ccda6afdb2e51b
2018-03-08 00:07:32 +00:00
Andreas Terzis
22b548670b
Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev am: d9eba6b856
...
am: 97e9f1611e
Change-Id: Ib97c62ef41b5377b37f5c8e52cee99d1398611a1
2018-03-08 00:05:15 +00:00
Fan Zhang
d68b9830cf
Merge "Clean up comment" into pi-dev
...
am: 12a8fced66
Change-Id: Ie7ad8654f289e9772ea395c362fa9a77be0eb217
2018-03-07 23:46:01 +00:00
Fan Zhang
3c5196a5de
Merge "Update string: clear data -> clear storage" into pi-dev
...
am: ad24c98c2d
Change-Id: Iea916ddb14f8202ea43b79577d272b66b77de8ab
2018-03-07 23:36:57 +00:00
TreeHugger Robot
12a8fced66
Merge "Clean up comment" into pi-dev
2018-03-07 23:34:43 +00:00
TreeHugger Robot
ad24c98c2d
Merge "Update string: clear data -> clear storage" into pi-dev
2018-03-07 23:26:30 +00:00
Andreas Terzis
97e9f1611e
Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev
...
am: d9eba6b856
Change-Id: Ic41ad59b20a933bef89f0f15989788b61c2e11ed
2018-03-07 23:25:05 +00:00
Salvador Martinez
e5569dc0b5
Update BatteryInfo to include averageTimeToDischarge am: db1efa3e03
...
am: ebb7148fd6
Change-Id: I9e5129c5ece438215dd9bede204b124401dc87db
2018-03-07 23:13:02 +00:00
TreeHugger Robot
322124d3c6
Merge "Introduce boolean flags to show/hide Encryption status."
2018-03-07 22:59:34 +00:00
Salvador Martinez
ebb7148fd6
Update BatteryInfo to include averageTimeToDischarge
...
am: db1efa3e03
Change-Id: Ibad0041006908e4ab4a229bf8dc7bde5f14bb18a
2018-03-07 22:51:56 +00:00
Andreas Terzis
d9eba6b856
Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev
2018-03-07 22:46:13 +00:00
Fan Zhang
9c18ac0554
Clean up comment
...
Bug: 73074893
Test: none
Change-Id: If7dcfcbb2e943d5734239ddb51c0e6ac798b641b
2018-03-07 13:36:58 -08:00
Fan Zhang
6acc0cf3cd
Update string: clear data -> clear storage
...
Change-Id: I710f7b95a53e5437d895ff920f3cce7aa4c5a6cf
Fixes: 34515307
Test: visual
2018-03-07 13:19:52 -08:00
Maurice Lam
4d1f4c77ff
Merge "Hide options button when user starts entering pattern"
2018-03-07 21:00:40 +00:00
Salvador Martinez
db1efa3e03
Update BatteryInfo to include averageTimeToDischarge
...
This updates the Estimate data model class as well as the places
it is used to populate the new field when available.
Test: robotests
Bug: 74020365
Change-Id: Ibcecf933819f8b8cd8514205768569e9bd7d1517
(cherry picked from commit 453db0cdbc
)
Merged-In: 453db0cdbc
2018-03-07 20:39:59 +00:00
Salvador Martinez
2631a55826
Merge "Update BatteryInfo to include averageTimeToDischarge"
2018-03-07 20:38:05 +00:00
Yueming Wang
bba23f6ee2
Merge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev am: fd7b78afb0
...
am: 82edd2006c
Change-Id: Ie2dc14320ed634f90862f42e6a72a06bf24caf05
2018-03-07 20:25:26 +00:00
Andreas Terzis
30743c787e
Rename "Billing Cycle" to "App usage cycle".
...
Under Settings > Data Usage, rename "Billing cycle" to
"Data warning & limit".
In the new "Data warning & limit" screen rename "Billing cycle"
to "App usage cycle".
Bug: 74321150
Test: manual
Change-Id: Ied4fd604fe98f5fc613fd4f7fc3a3bea5908bb7c
2018-03-07 12:19:36 -08:00
Yueming Wang
82edd2006c
Merge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev
...
am: fd7b78afb0
Change-Id: Ib3f68f2b2372973b300091cbd9640f4cd5a972d0
2018-03-07 20:19:23 +00:00
Fan Zhang
228eaa94cb
Merge "Misc fixes to improve search" into pi-dev am: 6b83c2d332
...
am: 4a9cd8efc5
Change-Id: I27416a28efaf24fdfd7ff5b90fc53ccfddc774db
2018-03-07 20:19:23 +00:00
Yueming Wang
fd7b78afb0
Merge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev
2018-03-07 20:10:10 +00:00
Fan Zhang
4a9cd8efc5
Merge "Misc fixes to improve search" into pi-dev
...
am: 6b83c2d332
Change-Id: Ifd491df275c7e74bf52901b2a919e1f6043efe00
2018-03-07 20:07:50 +00:00
TreeHugger Robot
6b83c2d332
Merge "Misc fixes to improve search" into pi-dev
2018-03-07 19:59:11 +00:00
jackqdyulei
a65404f0b3
Merge "Add dump log for BatteryTip." into pi-dev am: 26b5b5b5db
...
am: 7f5e5e0522
Change-Id: Iabe15152c4d62a06ff5b4cd2e32f5bf86a157360
2018-03-07 19:42:10 +00:00
jackqdyulei
7f5e5e0522
Merge "Add dump log for BatteryTip." into pi-dev
...
am: 26b5b5b5db
Change-Id: I0738c5dce35fa045b4393a246d4df2c2cba1c986
2018-03-07 19:19:06 +00:00
TreeHugger Robot
26b5b5b5db
Merge "Add dump log for BatteryTip." into pi-dev
2018-03-07 18:53:09 +00:00
Salvador Martinez
453db0cdbc
Update BatteryInfo to include averageTimeToDischarge
...
This updates the Estimate data model class as well as the places
it is used to populate the new field when available.
Test: robotests
Bug: 74020365
Change-Id: Ibcecf933819f8b8cd8514205768569e9bd7d1517
2018-03-07 10:26:59 -08:00
Fan Zhang
02caf0f861
Misc fixes to improve search
...
- Suppress one of results from "On lock screen"
- Remove screen title from sub sections in data usage screen.
- On UserSettins, index using resource instead raw. And build
non-indexables using getNonIndexable and pref controlleres.
Change-Id: I947a97af60f1a08b237fda2f3c456cf1105b9231
Fixes: 74120518
Fixes: 74119743
Fixes: 74250251
Fixes: 74119687
Test: reindex
2018-03-07 10:00:57 -08:00
Victor Chang
fbff3392b3
Merge "Enable new time zone picker" into pi-dev am: 3c5aeac39f
...
am: 946ef307f1
Change-Id: I82faedd1f9cc69d6baa3447484a0e891b09e6a1c
2018-03-07 17:39:58 +00:00
Victor Chang
2d9a09a7d5
Merge "New time zone picker page" into pi-dev am: 999e4f4405
...
am: 4e77e8bc7a
Change-Id: I19909658b018d297fe3b70c15db9f149dccccfe9
2018-03-07 17:39:34 +00:00
Victor Chang
946ef307f1
Merge "Enable new time zone picker" into pi-dev
...
am: 3c5aeac39f
Change-Id: Ib844e5506d3a3805513988be2036e642ecd28fed
2018-03-07 17:27:51 +00:00
Victor Chang
4e77e8bc7a
Merge "New time zone picker page" into pi-dev
...
am: 999e4f4405
Change-Id: I30588e0e89d644c5575be6c2c2512bc5fb7d71a6
2018-03-07 17:27:22 +00:00
jackqdyulei
950db96cff
Merge "Update dabase manager to store the uid" into pi-dev am: ef6eb853f9
...
am: 1cde42454f
Change-Id: I7c25cfac032f88e5a92bfd9ae37d5ccf47b9227b
2018-03-07 17:21:33 +00:00
Beverly
5ef01a7246
Merge "System gets its own dnd toggle" into pi-dev am: 1e9268b52e
...
am: a6b969b934
Change-Id: Ie27a02483f4ba1be49f1b87cf56d46fe2d93f79a
2018-03-07 17:10:00 +00:00
Victor Chang
3c5aeac39f
Merge "Enable new time zone picker" into pi-dev
2018-03-07 17:09:59 +00:00
Victor Chang
999e4f4405
Merge "New time zone picker page" into pi-dev
2018-03-07 17:09:59 +00:00
jackqdyulei
1cde42454f
Merge "Update dabase manager to store the uid" into pi-dev
...
am: ef6eb853f9
Change-Id: I3b6dffac3f4a854f15562f4ae08054c77ff97c9a
2018-03-07 17:04:58 +00:00
TreeHugger Robot
ef6eb853f9
Merge "Update dabase manager to store the uid" into pi-dev
2018-03-07 16:57:35 +00:00
Beverly
a6b969b934
Merge "System gets its own dnd toggle" into pi-dev
...
am: 1e9268b52e
Change-Id: I7d697d483791a30a8c6ad966dad760bcc00e02f3
2018-03-07 16:53:44 +00:00
TreeHugger Robot
1e9268b52e
Merge "System gets its own dnd toggle" into pi-dev
2018-03-07 16:39:40 +00:00
yuemingw
3bf4b9365e
Block location accuracy when DISALLOW_CONFIG_LOCATION is set.
...
Bug: 72633181
Test: make ROBOTEST_FILTER=InjectedSettingTest -j40 RunSettingsRoboTests
Test: make ROBOTEST_FILTER=LocationServicePreferenceControllerTest -j40 RunSettingsRoboTests
Change-Id: I91e4dbff8bcce637424646f5435e72f9bb707631
2018-03-07 14:07:16 +00:00
Victor Chang
7cf7fe4f9e
Enable new time zone picker
...
- Change the UI test due to UI changes
Bug: 73952488
Test: m RunSettingsRoboTest
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6d5716347e9debf429b757f1edd4118e86b70fab
(cherry picked from commit 335c0621d2
)
2018-03-07 13:37:00 +00:00
Victor Chang
db0cd2450e
Merge "Enable new time zone picker"
2018-03-07 13:36:40 +00:00
Anton Hansson
af8ad46b3d
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" am: 02e3229580
-s ours am: 57dc4a18c2
-s ours
...
am: 286caf5a4d
-s ours
Change-Id: I81e1dd284e8b401bf8bd8ebd83e17db56021450c
2018-03-07 12:03:22 +00:00
Anton Hansson
286caf5a4d
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" am: 02e3229580
-s ours
...
am: 57dc4a18c2
-s ours
Change-Id: Ic5827ccc458a510e7def73966de50b6aae8ed67f
2018-03-07 11:57:20 +00:00
Victor Chang
d5adf42c5e
New time zone picker page
...
- Show current selected region and time zone in a 2 rows.
Defailed info of current selected time zone in footer
- Show option menu to switch to select UTC offset
- This picker will be changed to the default picker in a later CL
Bug: 73952488
Test: m RunSettingsRoboTests
Change-Id: Ia81bb022e1021369612f5bd60c2c1f4d08db2af8
(cherry picked from commit b7d588f341
)
2018-03-07 11:52:25 +00:00