jackqdyulei
b65ae02db2
Merge "Make "Add device" as restricted preference." into pi-dev
...
am: e03bb88c09
Change-Id: I8ba721585a25bdc45b4d3dff97811955e02715b6
2018-03-08 03:05:09 +00:00
TreeHugger Robot
e03bb88c09
Merge "Make "Add device" as restricted preference." into pi-dev
2018-03-08 02:58:25 +00:00
Fan Zhang
29f7e7f13c
Merge "Move Auto sync data prefs from user to account screen" into pi-dev
...
am: 799c2545c0
Change-Id: I134995bd6c9191db9f82941c1212f7ef598fbef3
2018-03-08 02:20:27 +00:00
Lei Yu
89105f7c47
Merge "Add whitelist for anomaly detection." into pi-dev
...
am: 13eb2f18b4
Change-Id: I2fd14ec8f8f1770856c8aabf49e0e39210a08293
2018-03-08 02:07:58 +00:00
Fan Zhang
9bbfe66b23
Merge "For vibration settings page, create controllers from xml" into pi-dev
...
am: f3cfced1d1
Change-Id: I518634fb8e61f701ee8acab19855df5c941fec53
2018-03-08 02:01:52 +00:00
TreeHugger Robot
799c2545c0
Merge "Move Auto sync data prefs from user to account screen" into pi-dev
2018-03-08 02:01:46 +00:00
Lei Yu
13eb2f18b4
Merge "Add whitelist for anomaly detection." into pi-dev
2018-03-08 01:14:51 +00:00
TreeHugger Robot
f3cfced1d1
Merge "For vibration settings page, create controllers from xml" into pi-dev
2018-03-08 01:07:38 +00:00
Fan Zhang
ad47e1aada
Move Auto sync data prefs from user to account screen
...
Change-Id: Idb69ed49c6e21f93cafa593ba5e7dffa32f377b7
Fixes: 73739376
Test: existing robotests & atest
2018-03-07 15:53:18 -08: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
ebb7148fd6
Update BatteryInfo to include averageTimeToDischarge
...
am: db1efa3e03
Change-Id: Ibad0041006908e4ab4a229bf8dc7bde5f14bb18a
2018-03-07 22:51:56 +00:00
Fan Zhang
36680b0934
For vibration settings page, create controllers from xml
...
This change leverages a new support in settings framework to
automatically share preference controllers between full setting page,
search, and slice provider.
Bug: 73668763
Test: existing robotest and atest
Change-Id: Ie96a28f1b503377b3fdf86e28d297c8560d8bf71
2018-03-07 14:48:26 -08: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
jackqdyulei
10051afb96
Add whitelist for anomaly detection.
...
Even though we can add whitelist in config, we still need to have a
on device whitelist to reduce the size of config.
Use doze whitelist here because we already used it to detect whether
we can restrict the app in battery detail page.
Bug: 74241534
Test: RunSettingsRoboTests
Change-Id: I35b6f3eba9fbc8ae51bb02cd9d5416e4360c388e
2018-03-07 13:20:36 -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
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
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
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
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
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
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
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
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
819f53a7ee
Catch SecurityException from enabling backup activity
...
am: 368b5a6b2c
Change-Id: I47613de2c00db93d906414f1e51baea9cbc7606a
2018-03-07 11:02:45 +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
jackqdyulei
eb562c9457
Make "Add device" as restricted preference.
...
Restrict it by DISALLOW_CONFIG_BLUETOOTH
Bug: 73739404
Test: Manual
Change-Id: Ia550930ccf9f372b15826e24d3677124efd36fe9
2018-03-07 04:23:05 +00:00
jackqdyulei
36249c6254
Update dabase manager to store the uid
...
Also update the AppInfo to store the uid
Bug: 74022362
Test: RunSettingsRoboTests
Change-Id: I373242a12e9dbf48be134f2e9be30831b09f91c9
2018-03-07 04:20:13 +00:00
Yoshinori Hirano
fd8527901e
Merge "Add SettingsMultiSelectListPreference style" into pi-dev
...
am: 106825383a
Change-Id: I6a796081208050d58a42a32ec69a2bd20cee1fcf
2018-03-07 04:19:47 +00:00
Doris Ling
9f6608a729
Merge "Add strings for audio output switcher." into pi-dev
...
am: 6775ff9542
Change-Id: Id400699f8d74cdda74721fdd193dc809d998bce5
2018-03-07 04:17:56 +00:00
jackqdyulei
da31b26d8b
Merge changes from topic "tip_new_page-pi-dev" into pi-dev
...
am: a276b8d580
Change-Id: Icb1d923c07e48466b7f024e091d01c69a001073e
2018-03-07 04:10:32 +00:00