Commit Graph

43448 Commits

Author SHA1 Message Date
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
Anton Hansson
57dc4a18c2 Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE"
am: 02e3229580  -s ours

Change-Id: I24575750c99fe081f28ea7a5f73307e3bfd8c950
2018-03-07 11:51:48 +00:00
Anton Hansson
02e3229580 Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" 2018-03-07 11:27:19 +00:00
Bernardo Rufino
7f1308b373 Catch SecurityException from enabling backup activity am: 368b5a6b2c
am: 819f53a7ee

Change-Id: Ib3e1f967dd21a9afa14f2f107a449e6e9424e3c5
2018-03-07 11:09:51 +00:00
Victor Chang
07a396adb9 Merge "New time zone picker page" 2018-03-07 11:02:49 +00:00
Bernardo Rufino
819f53a7ee Catch SecurityException from enabling backup activity
am: 368b5a6b2c

Change-Id: I47613de2c00db93d906414f1e51baea9cbc7606a
2018-03-07 11:02:45 +00:00
Victor Chang
335c0621d2 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
2018-03-07 09:25:42 +00:00
Victor Chang
b7d588f341 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
2018-03-07 09:25:38 +00:00
Bernardo Rufino
368b5a6b2c Catch SecurityException from enabling backup activity
Cases where the activity is already enabled and the account is an unicorn
account.

Test: Opened activity from backup settings w/ unicorn account, verified
      no crash
Bug: 74199770
Change-Id: I7dc30d22b186ff19cf7c40fda0363ff1288224d1
2018-03-07 08:49:31 +00:00
Yoshinori Hirano
68d626a2a2 Merge "Add SettingsMultiSelectListPreference style" into pi-dev am: 106825383a
am: fd8527901e

Change-Id: I60c2b66126ef608cada2226becc56d6f02addcde
2018-03-07 06:57:28 +00:00
Doris Ling
88da3a7415 Merge "Add strings for audio output switcher." into pi-dev am: 6775ff9542
am: 9f6608a729

Change-Id: I8fbac57843b2ac2cd3d3f1916c23366821af2225
2018-03-07 06:50:50 +00:00
Yuchen Chang
49d314f8c3 [Settings] Request focus in Add network dialog
Request focus for SSID EditText to show IME when user choose add network in wifi
screen.

Bug: 72882629
Test: RunSettingsRobotests & Manual test
Change-Id: Iaf4db085c3d310a7f524217a90dc1fb7573d6814
2018-03-07 14:44:33 +08:00
jackqdyulei
01fad80d18 Merge changes from topic "tip_new_page-pi-dev" into pi-dev am: a276b8d580
am: da31b26d8b  -s ours

Change-Id: I2d03f7a49d6dd08126afc5d1e27ba4472ee1801b
2018-03-07 06:38:02 +00:00
jackqdyulei
579b27c215 Merge "Add auto restriction preference" into pi-dev am: f178692bc5
am: 3968b061e8  -s ours

Change-Id: I27b1992db249ad79961b38ef1fea1b0427f94dce
2018-03-07 05:18:20 +00:00
Fan Zhang
0aeb4b6d81 Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev am: 710207f024
am: f90db69a3c

Change-Id: I0a8c3deabe971aa884ee63552075e50a8e0dee6c
2018-03-07 05:17:05 +00:00
Doris Ling
c6ed3b82be Merge "Add intent fields when launching instant app." into pi-dev am: dce675c158
am: 5675610456

Change-Id: Ie23a11bc172a829e95f66102dfa052ecdaf61723
2018-03-07 05:16:37 +00:00
Doris Ling
5cb3973d0a Merge "Fix crash in battery info settings page." into pi-dev am: 83d9047ef4
am: b5884f48d5

Change-Id: I3d862b301898332bde50767dc60b7a5a9d9a6a5e
2018-03-07 04:29:10 +00:00