Antony Sargent
086df75f9a
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49
skipped: d923718d10
skipped: 59ab695e25
skipped: eb76bf9861
skipped: 5755ec9bff
skipped: ddd9cb6be9
skipped: 6827142bd1
skipped: ca801490c1
skipped: fb6a179745
am: 5943908af4
-s ours
...
am: f224aa6af9
-s ours
Change-Id: I0441b99e9f7b945d41303fdc8d0e412426a081e3
2018-03-08 19:48:36 +00:00
Maurice Lam
a9a48d83d4
Hide options button when user starts entering pattern
...
am: 4723abfe26
Change-Id: I3223a1a40b08c0dcef90ec117ac08b1888e6174e
2018-03-08 19:43:21 +00:00
Antony Sargent
f224aa6af9
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49
skipped: d923718d10
skipped: 59ab695e25
skipped: eb76bf9861
skipped: 5755ec9bff
skipped: ddd9cb6be9
skipped: 6827142bd1
skipped: ca801490c1
skipped: fb6a179745
...
am: 5943908af4
-s ours
Change-Id: I26672d57ced63374a8b03ae3e8e0647c6a4bd150
2018-03-08 19:42:30 +00:00
Victor Chang
bb61d3696c
Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev am: 4f5a113d8f
...
am: 894f5521ab
Change-Id: I1ccf2442418b0e655f7969b803a9bc09de227b44
2018-03-08 19:37:49 +00:00
Brad Ebinger
be581fd7ef
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." am: 4ec0e8e865
...
am: 9b282e231f
Change-Id: I95a108f4e6090b61e4584a64bed58c024e120fd0
2018-03-08 19:18:08 +00:00
Brad Ebinger
9b282e231f
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
...
am: 4ec0e8e865
Change-Id: I04c42bb5786b37f6d9aa124a663eef6d69b930a2
2018-03-08 19:13:20 +00:00
Maurice Lam
4723abfe26
Hide options button when user starts entering pattern
...
Test: cd tests/robotests && mma
Bug: 72409245
Change-Id: I82ab8822f13bc8bf8b74bc67f6d4d3a9fd2cc0c8
(cherry picked from commit ad554244b6
)
2018-03-08 18:59:29 +00:00
Victor Chang
894f5521ab
Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev
...
am: 4f5a113d8f
Change-Id: Icadc36b185da4f26c81985895569b18d9234f639
2018-03-08 18:58:32 +00:00
TreeHugger Robot
4f5a113d8f
Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev
2018-03-08 18:45:30 +00:00
Ben Lin
bd180a62ec
Introduce boolean flag to show/hide Reset Options.
...
This adds one new flag:
config_show_reset_dashboard
Which when set to false, will hide Reset Options from System settings.
Bug: 74127210
Test: Updated robotests
Change-Id: I42b14a0abde575f5c4e51985125e8543716d206a
2018-03-08 10:44:48 -08:00
Brad Ebinger
4ec0e8e865
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
2018-03-08 18:32:56 +00:00
Makoto Onuki
113e3d5cc0
Get auto-battery saver threshold max from global setting
...
Bug: 74351418
Test: Manual test with "settings put global low_power_trigger_level_max 100"
Test: m ROBOTEST_FILTER=AutoBatterySeekBarPreferenceControllerTest RunSettingsRoboTests
Change-Id: Ice25835f36e7855e3ed665cd780d7eb1a26acd27
2018-03-08 08:19:37 -08:00
Victor Chang
d251a10cd6
Show time zone standard name in FixedOffsetPreferenceController
...
- Among all fixed offset time zone, only Etc/UTC has a time zone
standard name. The name should be shown in both picker and preference's
secondary text (summary).
Bug: 74338688
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: I10c140f6054ab9acf6e0fb44528adef8b28fa23c
2018-03-08 15:13:15 +00:00
Doris Ling
14abf8d05a
Merge "Fix layout height for suggestion tile." into pi-dev am: ec9606addb
...
am: 7eef8156ea
Change-Id: Ic4ba2e6fe757648304c90e22eb59b1a4535ef23e
2018-03-08 05:44:39 +00:00
Doris Ling
7eef8156ea
Merge "Fix layout height for suggestion tile." into pi-dev
...
am: ec9606addb
Change-Id: I518af49e44a386ef6fcc7381f11ad0b635ba3ea7
2018-03-08 05:40:11 +00:00
TreeHugger Robot
ec9606addb
Merge "Fix layout height for suggestion tile." into pi-dev
2018-03-08 05:32:25 +00:00
Bill Yi
39b2ef235d
Merge "Import translations. DO NOT MERGE" into pi-dev am: 7c2713cb2d
-s ours
...
am: 663ad81f07
-s ours
Change-Id: I6e1a89edd4db691445bd4cfc3bf6925c399d70a7
2018-03-08 05:28:16 +00:00
Bill Yi
663ad81f07
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 7c2713cb2d
-s ours
Change-Id: I8eabcb331f4eb0809c644e724fe5a6a07802210b
2018-03-08 05:22:18 +00:00
TreeHugger Robot
7c2713cb2d
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-08 05:12:11 +00:00
TreeHugger Robot
5cb1e79157
Merge "[Settings] Request focus in Add network dialog"
2018-03-08 04:12:01 +00:00
jackqdyulei
0c2cd535c1
Merge "Update fuelguage to use uid in AppInfo" into pi-dev am: 6949175423
...
am: 6217b5cd7e
Change-Id: I9a045d24a8321a5c8af0699b148db964ab700e7c
2018-03-08 03:36:19 +00:00
jackqdyulei
6217b5cd7e
Merge "Update fuelguage to use uid in AppInfo" into pi-dev
...
am: 6949175423
Change-Id: I31a6b9eeaba39e3678945796b729ddede797a28e
2018-03-08 03:32:00 +00:00
jackqdyulei
4ef021ee90
Merge "Make "Add device" as restricted preference." into pi-dev am: e03bb88c09
...
am: b65ae02db2
Change-Id: I256f92fc14b5c630bfbde737b1c8bf641de36fd3
2018-03-08 03:23:20 +00:00
TreeHugger Robot
6949175423
Merge "Update fuelguage to use uid in AppInfo" into pi-dev
2018-03-08 03:22:40 +00:00
Fan Zhang
6f8ac904bf
Merge "Move Auto sync data prefs from user to account screen" into pi-dev am: 799c2545c0
...
am: 29f7e7f13c
Change-Id: Ie84c7b50abb0ab9338d852342f61c35bfeb6dccc
2018-03-08 03:10:10 +00:00
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
Lei Yu
1d43ece8eb
Merge "Add whitelist for anomaly detection." into pi-dev am: 13eb2f18b4
...
am: 89105f7c47
Change-Id: Ia9f35980849babc7eff9ff165cd0f130b522411a
2018-03-08 02:54:23 +00:00
Fan Zhang
3df75ce8ce
Merge "For vibration settings page, create controllers from xml" into pi-dev am: f3cfced1d1
...
am: 9bbfe66b23
Change-Id: Ic72312be3b7f23f5a0b2038585e9b0e4140da180
2018-03-08 02:21:50 +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
jackqdyulei
c7a0c33ab5
Update fuelguage to use uid in AppInfo
...
The uid is needed to distinguish the same app used
by different users(even work profile user). So
we need to store the correct uid in AppInfo and
use it across the settings app.
Bug: 74022362
Test: RunSettingsRoboTests
Change-Id: Iaa0ea1ac1fbd3a3a1251e0cd1096d6a8c75c4ed8
2018-03-08 01:33:54 +00:00
John Reck
ae7a241ee7
Merge "Remove obsolete development setting"
2018-03-08 01:28:10 +00:00
Lei Yu
13eb2f18b4
Merge "Add whitelist for anomaly detection." into pi-dev
2018-03-08 01:14:51 +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
f3cfced1d1
Merge "For vibration settings page, create controllers from xml" into pi-dev
2018-03-08 01:07:38 +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
Ajay Panicker
e5ed810753
Bluetooth: Enable AVDTP Delay reports by default.
...
Bug: 32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: I03bd216eb1725ee3e2e5da4e0baae61007ba2dcf
Merged-In: Icba9be6fc8ba455d37df39d283e36129f6acb536
2018-03-08 00:00:13 +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
Bill Yi
92931b1fae
Import translations. DO NOT MERGE
...
BUG:72647570
Change-Id: I0056af6763c58ffc34e49c3c6f84211c1c9a674c
Auto-generated-cl: translation import
2018-03-07 15:28:17 -08: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