Isha Bobra
ea72074ed7
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev am: d87acaf3cf
...
am: 595cda2d14
2018-04-16 10:03:34 -07:00
Isha Bobra
595cda2d14
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
...
am: d87acaf3cf
2018-04-16 09:56:17 -07:00
Isha Bobra
d87acaf3cf
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
2018-04-16 16:42:33 +00:00
HJ ChangLiao
a8000ddd9b
Merge "Register ConnectDeviceFrag with new key" into pi-dev am: 28041fb8cd
...
am: 5c79fbd97c
2018-04-14 21:11:37 -07:00
HJ ChangLiao
5c79fbd97c
Merge "Register ConnectDeviceFrag with new key" into pi-dev
...
am: 28041fb8cd
2018-04-14 20:56:01 -07:00
Bill Yi
edbcd64294
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9470271d85 -s ours
...
am: cbb9ab8ad3
2018-04-14 20:53:37 -07:00
Jeff Sharkey
25fe7a27b5
Merge "Storage wizard string changes per UX request." into pi-dev am: 290edd0b73
...
am: 1e916920c5
2018-04-14 20:41:12 -07:00
Bill Yi
cbb9ab8ad3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 9470271d85
2018-04-14 20:35:44 -07:00
Jeff Sharkey
1e916920c5
Merge "Storage wizard string changes per UX request." into pi-dev
...
am: 290edd0b73
2018-04-14 20:28:09 -07:00
Maurice Lam
3ddbaf439a
Merge "Update fingerprint illustration" into pi-dev am: 20bb2edda7
...
am: 13c77a93a9
2018-04-14 20:16:09 -07:00
Andrew Sapperstein
142d367a4c
Merge "Use the correct text for DND onboarding." into pi-dev am: 15234d7eb4
...
am: 3b6cbb2f4c
2018-04-14 20:10:27 -07:00
Maurice Lam
13c77a93a9
Merge "Update fingerprint illustration" into pi-dev
...
am: 20bb2edda7
2018-04-14 19:55:53 -07:00
Andrew Sapperstein
3b6cbb2f4c
Merge "Use the correct text for DND onboarding." into pi-dev
...
am: 15234d7eb4
2018-04-14 19:50:31 -07:00
Salvador Martinez
052baf58a0
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev am: 1678488736
...
am: 230d6420b9
2018-04-14 19:28:54 -07:00
Salvador Martinez
230d6420b9
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
...
am: 1678488736
2018-04-14 19:02:25 -07:00
Salvador Martinez
3cdd5eedcc
[automerger skipped] Merge "Update bluetooth preference to take user to new screen" into pi-dev am: ce53cbeef7
...
am: fbc5abb8e1
2018-04-14 18:20:29 -07:00
Lifu Tang
9609edb8f9
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev am: 6229c0f4eb
...
am: 531defb0b3
2018-04-14 18:19:52 -07:00
Salvador Martinez
9df9101526
Merge "Add strings for AP band UI changes" into pi-dev am: 6baefa4b51
...
am: 0354854ab9
2018-04-14 18:19:25 -07:00
Andrew Sapperstein
4eae68681c
Merge "Remove menu from Network & Internet screen." into pi-dev am: 23035d558a
...
am: 3fdfb99375
2018-04-14 18:18:53 -07:00
Salvador Martinez
fbc5abb8e1
Merge "Update bluetooth preference to take user to new screen" into pi-dev
...
am: ce53cbeef7
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
2018-04-14 17:35:27 -07:00
Salvador Martinez
0354854ab9
Merge "Add strings for AP band UI changes" into pi-dev
...
am: 6baefa4b51
2018-04-14 17:34:56 -07:00
Andrew Sapperstein
3fdfb99375
Merge "Remove menu from Network & Internet screen." into pi-dev
...
am: 23035d558a
2018-04-14 17:34:27 -07:00
TreeHugger Robot
28041fb8cd
Merge "Register ConnectDeviceFrag with new key" into pi-dev
2018-04-14 23:12:48 +00:00
TreeHugger Robot
9470271d85
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-14 17:01:25 +00:00
TreeHugger Robot
40fa7923b1
Merge "Import translations. DO NOT MERGE"
2018-04-14 04:33:12 +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
Bill Yi
581a0d54bd
Import translations. DO NOT MERGE
...
Change-Id: I7cf53a9ffbc077211999a42f73bb41e5cbe78932
Auto-generated-cl: translation import
2018-04-13 19:53:43 -07: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
Isha Bobra
35e217f91f
Show only 1 entry for hearing aid devices without killing the activity.
...
This CL tries to detect Bluetooth hearing aid devices and tries to
combine the entry of the hearing aids with the same HiSyncIds and
show only 1 entry for each pair in the connected devices list.
This CL also shows 2 battery status in the device details page.
This change shows the combined entry after a user returns to the
settings activity after pressing the back button or somehow
without killing it. It also combines the entries just after pairing.
Test: RunSettingsRoboTests
Bug: 74204427
Change-Id: I47fb0bdd96b1cc972d88a4aef85d0113985d63bb
2018-04-13 22:51:58 +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
Fan Zhang
b6d40d133b
Use DateUtils to build account sync timestamp
...
Change-Id: I2158855bd2caba42f64d24ab2fb00c6b561e5cef
Fixes: 77913394
Test: visual
2018-04-13 22:27:43 +00: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
TreeHugger Robot
b0339949a3
Merge "Update bluetooth preference to take user to new screen"
2018-04-13 20:56:18 +00: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
05cdb9898b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: d57d27acab -s ours
...
am: 33c5997147
2018-04-13 13:29:17 -07:00
Doris Ling
728916e67c
Merge "Hide Default apps and App permissions under Advanced." into pi-dev am: 36800c5115
...
am: 9095c97ee3
2018-04-13 13:26:16 -07:00
Bill Yi
33c5997147
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: d57d27acab
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
2018-04-13 13:02:10 -07:00
