Bill Yi
cbb9ab8ad3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 9470271d85 -s ours
Change-Id: I810c2412aae8c3b92a5c66d4de3494efa22a447c
2018-04-14 20:35:44 -07:00
Jeff Sharkey
1e916920c5
Merge "Storage wizard string changes per UX request." into pi-dev
...
am: 290edd0b73
Change-Id: Icfb93cba765d380ceb9e3c3bb855f5e4af8dc0b4
2018-04-14 20:28:09 -07:00
Maurice Lam
13c77a93a9
Merge "Update fingerprint illustration" into pi-dev
...
am: 20bb2edda7
Change-Id: Ibd7a1835f7dd0de4ea6c6d0569b80eb8b6470155
2018-04-14 19:55:53 -07:00
Andrew Sapperstein
3b6cbb2f4c
Merge "Use the correct text for DND onboarding." into pi-dev
...
am: 15234d7eb4
Change-Id: Ib47f7f86998e4e070b7d4dc4abf6be563f2d6867
2018-04-14 19:50:31 -07:00
Salvador Martinez
230d6420b9
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
...
am: 1678488736
Change-Id: I0ea6f839eb33ba147ebae657999164b872d57fb6
2018-04-14 19:02:25 -07:00
Salvador Martinez
fbc5abb8e1
Merge "Update bluetooth preference to take user to new screen" into pi-dev
...
am: ce53cbeef7
Change-Id: Ic37c4b30a82cefb4f888d5c5183b6f6bae2b67d2
2018-04-14 17:36:20 -07:00
Lifu Tang
531defb0b3
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev
...
am: 6229c0f4eb
Change-Id: I43b9fa6273ded8ec9b0b0928a9d02167c720d562
2018-04-14 17:35:27 -07:00
Salvador Martinez
0354854ab9
Merge "Add strings for AP band UI changes" into pi-dev
...
am: 6baefa4b51
Change-Id: I2fd9ae450a9cf1322338c080dedc40d7961f379d
2018-04-14 17:34:56 -07:00
Andrew Sapperstein
3fdfb99375
Merge "Remove menu from Network & Internet screen." into pi-dev
...
am: 23035d558a
Change-Id: Ib7a25cfad474304683304778e4fa7d32a2bb187b
2018-04-14 17:34:27 -07:00
TreeHugger Robot
9470271d85
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-14 17:01:25 +00:00
Bill Yi
c5eadd8ad5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I5292358d043bede11ff4791263b007d31b04d8b6
2018-04-13 20:57:48 -07:00
TreeHugger Robot
290edd0b73
Merge "Storage wizard string changes per UX request." into pi-dev
2018-04-14 03:08:23 +00:00
TreeHugger Robot
20bb2edda7
Merge "Update fingerprint illustration" into pi-dev
2018-04-14 01:36:27 +00:00
TreeHugger Robot
15234d7eb4
Merge "Use the correct text for DND onboarding." into pi-dev
2018-04-14 01:34:34 +00:00
TreeHugger Robot
1678488736
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
2018-04-14 01:25:33 +00:00
Andrew Sapperstein
821217c713
Use the correct text for DND onboarding.
...
Update the screen on title to use the screen on
text instead of the screen off text.
Bug: 78019397
Test: visual inspection
Change-Id: Ie5c0b462b44ad735963c2800a59a20288b1cadf8
2018-04-13 17:24:33 -07:00
TreeHugger Robot
ce53cbeef7
Merge "Update bluetooth preference to take user to new screen" into pi-dev
2018-04-13 23:00:52 +00:00
TreeHugger Robot
6229c0f4eb
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev
2018-04-13 22:54:18 +00:00
TreeHugger Robot
6baefa4b51
Merge "Add strings for AP band UI changes" into pi-dev
2018-04-13 22:51:25 +00:00
Salvador Martinez
7486f1cf12
Fix mistake in onActivityResult for ConfigureWifiSettings
...
Accidently checked the result code instead of request code when
trying to route the callback to the correct controller. This
CL fixes that.
Test: robotests still pass
Bug: 77543817
Change-Id: Ice1dd799d3f06f86743940c5202d308c21e88cdf
2018-04-13 15:29:44 -07:00
Salvador Martinez
9eac182805
Update bluetooth preference to take user to new screen
...
This CL removes the toggle from the bluetooth preference and instead
takes users to a new dedicated screen for toggling bluetooth status.
On this screen we show a different summary text depending on whether
bluetooth and bluetooth scanning are on/off. Also, we were able to
delegate most of the UI/bluetooth handling to already existing
classes.
Test: robotests
Bug: 77543471
Merged-In: I036a3992bbd78896da8364b55ecc51afc4464b6e
Change-Id: I036a3992bbd78896da8364b55ecc51afc4464b6e
2018-04-13 15:07:45 -07:00
TreeHugger Robot
23035d558a
Merge "Remove menu from Network & Internet screen." into pi-dev
2018-04-13 22:07:22 +00:00
Jeff Sharkey
a4c79279ef
Storage wizard string changes per UX request.
...
Bug: 77207119
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I93adf01442d006927c792db405d8cf73c963dd40
2018-04-13 15:20:32 -06:00
Salvador Martinez
6135564f91
Add strings for AP band UI changes
...
This CL just adds strings needed for another change. See change with
id = Ib2d4a2834c5cd11875515d308f7b20bfc8471959
Test: just adds string
Bug: 73102003
Change-Id: Ibd0ded108f49e481d2a858960b9add48a09cc497
2018-04-13 14:19:49 -07:00
Andrew Sapperstein
e358876bc1
Remove menu from Network & Internet screen.
...
Only one item was left "reset wi-fi, mobile & bluetooth"
which is also an option in Reset. So we're just removing
it so that there's no overflow menu at all.
Change-Id: I0298192667fb4ac2f58f51232ae2da1842e6c27e
Fixes: 77986130
Test: robotests
2018-04-13 13:48:05 -07:00
Lifu Tang
f72f8309e0
Add a wrapper Activity to launch scanning settings
...
GmsCore needs to start scanning settings from notification
Bug: 77823544
Test: adb shell am start -a android.settings.LOCATION_SCANNING_SETTINGS
Change-Id: Iecf1f811983068b29aa06a9985c83a5a1fb11a2a
2018-04-13 13:30:58 -07:00
Bill Yi
33c5997147
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: d57d27acab -s ours
Change-Id: I7e6ada7ca49496e0480d020c879fe2dc0d762e51
2018-04-13 13:03:28 -07:00
Doris Ling
9095c97ee3
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
...
am: 36800c5115
Change-Id: I15bba4d3ae39d5aca176890624048bbe14a1c59f
2018-04-13 13:02:10 -07:00
Daniel Nishi
f47e1a3930
Merge "Warn users before they change device name." into pi-dev
...
am: cd01a3ecd9
Change-Id: I75c974c944dcda55b19dc4566cdb56f9811d2212
2018-04-13 12:51:10 -07:00
TreeHugger Robot
d57d27acab
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-13 19:44:37 +00:00
Doris Ling
36800c5115
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
2018-04-13 19:44:11 +00:00
Daniel Nishi
cd01a3ecd9
Merge "Warn users before they change device name." into pi-dev
2018-04-13 19:31:15 +00:00
Fan Zhang
08becf87f4
Merge "Support customizing icon color for externally items." into pi-dev
...
am: 98a2064b61
Change-Id: I501f26d19f66e42aaa8bbcad6a7c91895a24b443
2018-04-13 11:40:26 -07:00
Bill Yi
5d2ed57396
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I50e29a33b46f948023f4b85d1ebacb99397d6ec9
2018-04-13 11:39:46 -07:00
TreeHugger Robot
98a2064b61
Merge "Support customizing icon color for externally items." into pi-dev
2018-04-13 17:48:22 +00:00
Lei Yu
7f197d9c73
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
...
am: e6825db406
Change-Id: Ie9d2b695c2a86172154660430ea39a96cf66a9de
2018-04-13 09:55:16 -07:00
Lei Yu
e6825db406
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
2018-04-13 16:42:08 +00:00
Fan Zhang
7aa626b59d
Support customizing icon color for externally items.
...
When a setting is injected to homepage, we now allow the setting
provider customize the background color for its icon.
If no custom bg color is provided, we fallback to existing behavior.
This behavior is only needed in homepage, because we don't have any
tinting logic in other pages so external setting providers can just
provide arbitrary icon.
Bug: 77188317
Test: robotests
Change-Id: I7d4b512fafc28537de46192026ce4bbe51b498c4
2018-04-13 09:38:36 -07:00
Lei Yu
471b71fb1c
Merge "Log app versionCode in anomaly detection" into pi-dev
...
am: 70bd0c6d00
Change-Id: I72c442fe4ac8b0bd3c04a63d406e15342610bce0
2018-04-12 18:11:28 -07:00
Lei Yu
70bd0c6d00
Merge "Log app versionCode in anomaly detection" into pi-dev
2018-04-13 00:35:11 +00:00
Bill Yi
a3733c5f25
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 660e824061 -s ours
Change-Id: I18553a43f293c1d02a1a7d4a8c9e8c0d74fb9cb7
2018-04-12 17:28:48 -07:00
Fan Zhang
9bbb70ff85
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
...
am: f0c7038efe
Change-Id: I200feacea89591edc0b446d59e6b4a23a5daa7cd
2018-04-12 17:13:35 -07:00
TreeHugger Robot
660e824061
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-13 00:10:32 +00:00
ryanywlin
7c6dbcf0fc
Merge "Shuffle sound settings UI arrangment" into pi-dev
...
am: c22bada88a
Change-Id: I3f02057b6c7faa902a6832f4ac8dc878e67ac786
2018-04-12 16:57:04 -07:00
TreeHugger Robot
f0c7038efe
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
2018-04-12 23:35:15 +00:00
TreeHugger Robot
c22bada88a
Merge "Shuffle sound settings UI arrangment" into pi-dev
2018-04-12 23:16:28 +00:00
Doris Ling
fe126d116b
Merge "Use a different string for vpn summary." into pi-dev
...
am: a9261b4136
Change-Id: If11353a90933436bb1a2425e418369fc75d8a1ad
2018-04-12 16:08:57 -07:00
Daniel Nishi
74b1da5338
Warn users before they change device name.
...
This ensures users know that the change they make will be visible
through Bluetooth and Wi-Fi Hotspot.
Fixes: 74981919
Test: Settings robotest
Merged-In: Ib27066f4a123dc472730d7e663adfb039b1e27d6
2018-04-12 22:39:06 +00:00
Doris Ling
2b453c016f
Hide Default apps and App permissions under Advanced.
...
- decrease the initial expand count to move the 2 items into the
Advanced section in the Apps and notification page.
Change-Id: I5861c4c768d3a4d77677c75555d83065f2526a56
Fixes: 77823915
Test: manual
2018-04-12 15:31:32 -07:00
TreeHugger Robot
a9261b4136
Merge "Use a different string for vpn summary." into pi-dev
2018-04-12 22:26:54 +00:00