OSDN Git Service
Mill Chen [Thu, 12 Apr 2018 13:53:22 +0000 (13:53 +0000)]
WallpaperTypeSettings use DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
Bug:
73899467
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wallpaper
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I519a76ff34bcd4195b0ad6ad406a8f66371923d2
Emily Chuang [Tue, 3 Apr 2018 13:00:49 +0000 (21:00 +0800)]
Migrate UserDictionaryList to DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
Test: manual
Test: make RunSettingsRoboTests -j
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Ia3d885cb8917c7d5498b87818e24b938f0d95dbb
TreeHugger Robot [Mon, 16 Apr 2018 19:19:48 +0000 (19:19 +0000)]
Merge "Remove the dependency on InputMethodSettings"
hughchen [Mon, 16 Apr 2018 19:12:21 +0000 (12:12 -0700)]
Merge "Implement audio switch UI" into pi-dev am:
5a2f73151e
am:
608d436da0
Change-Id: Iea47d84345cfd10388a4c2ad34d5cedcfe7eaeb6
hughchen [Mon, 16 Apr 2018 18:56:28 +0000 (11:56 -0700)]
Merge "Implement audio switch UI" into pi-dev
am:
5a2f73151e
Change-Id: Ib20749758c6dd8a8db24e3d4dba29232bac46793
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Implement audio switch UI" into pi-dev
Lei Yu [Mon, 16 Apr 2018 17:59:36 +0000 (10:59 -0700)]
Merge "Remove battery usage preference in app info page" into pi-dev am:
ea7dd68480
am:
e5b270a4dd
Change-Id: I394652b3b170625fc51f54d675c9a07d951a72a3
Lei Yu [Mon, 16 Apr 2018 17:39:48 +0000 (10:39 -0700)]
Merge "Remove battery usage preference in app info page" into pi-dev
am:
ea7dd68480
Change-Id: I91f76bbedf9ef04a8a57fd1d68c747a0beb41148
TreeHugger Robot [Mon, 16 Apr 2018 17:14:49 +0000 (17:14 +0000)]
Merge "Remove battery usage preference in app info page" into pi-dev
Isha Bobra [Mon, 16 Apr 2018 17:03:34 +0000 (10:03 -0700)]
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev am:
d87acaf3cf
am:
595cda2d14
Change-Id: I49973a65a31f5f79722c4e4841f2dcda34128edb
Isha Bobra [Mon, 16 Apr 2018 16:56:17 +0000 (09:56 -0700)]
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
am:
d87acaf3cf
Change-Id: Id0d3f2912feff75a572c57230715ffeed0a68d80
Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
hughchen [Fri, 23 Mar 2018 08:14:13 +0000 (16:14 +0800)]
Implement audio switch UI
* Implement available media devices group
* Add AvailableMediaDeviceGroupController to realize UI, the user can see the all device that can be activated in this group.
* ConnectedDeviceGroupController change to show the device that cannot be activated but is connected.
* Refactoring the below class, implement the controller in connected_devices.xml.
ConnectedDeviceGroupController.java
SavedDeviceGroupController.java
ConnectedDeviceDashboardFragment.java
connected_devices.xml
* Add AvailableMediaBluetoothDeviceUpdaterTest to verify the add/remove preference behavior when connectedStateChanged or profileAudioStateChanged
* Add test that used to verify device is connected or not in BluetoothDeviceUpdaterTest.
* Add test that used to verify the add/remove preference behavior when connectedStateChanged or profileAudioStateChanged in ConnectedBluetoothDeviceUpdaterTest.
* Add AvailableMediaDeviceGroupControllerTest to verify bluetooth feature is supported or not and test register callback.
* Add test that used to verify bluetooth feature is supported or not and test register callback in ConnectedDeviceGroupControllerTest.
* Add test that used to verify bluetooth feature is supported or not and test register callback in SavedDeviceGroupControllerTest
Bug:
74134939
Test: make -j40 RunSettingsRoboTests
Change-Id: I54d03c2ddadc6a4be7519dd74cdbcb5055d44083
HJ ChangLiao [Sun, 15 Apr 2018 04:11:37 +0000 (21:11 -0700)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev am:
28041fb8cd
am:
5c79fbd97c
Change-Id: I950ccf423738ba6fce2d9a526d505384b04c50e7
HJ ChangLiao [Sun, 15 Apr 2018 03:56:01 +0000 (20:56 -0700)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev
am:
28041fb8cd
Change-Id: I6b1a56f48d474b8d5dc2417ce9154408bb10d328
Bill Yi [Sun, 15 Apr 2018 03:53:37 +0000 (20:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
9470271d85 -s ours
am:
cbb9ab8ad3 -s ours
Change-Id: I41fb8019799db51d33c1aca7267f719801550647
Jeff Sharkey [Sun, 15 Apr 2018 03:41:12 +0000 (20:41 -0700)]
Merge "Storage wizard string changes per UX request." into pi-dev am:
290edd0b73
am:
1e916920c5
Change-Id: Ie66f1e4d6daa98640e7e56efb7862be0d1c18914
Bill Yi [Sun, 15 Apr 2018 03:35:44 +0000 (20:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9470271d85 -s ours
Change-Id: I810c2412aae8c3b92a5c66d4de3494efa22a447c
Jeff Sharkey [Sun, 15 Apr 2018 03:28:09 +0000 (20:28 -0700)]
Merge "Storage wizard string changes per UX request." into pi-dev
am:
290edd0b73
Change-Id: Icfb93cba765d380ceb9e3c3bb855f5e4af8dc0b4
Maurice Lam [Sun, 15 Apr 2018 03:16:09 +0000 (20:16 -0700)]
Merge "Update fingerprint illustration" into pi-dev am:
20bb2edda7
am:
13c77a93a9
Change-Id: I62e2e925beb940cb6d37b0d94eda3c6bbca2bede
Andrew Sapperstein [Sun, 15 Apr 2018 03:10:27 +0000 (20:10 -0700)]
Merge "Use the correct text for DND onboarding." into pi-dev am:
15234d7eb4
am:
3b6cbb2f4c
Change-Id: Ia7f900929a6d36457581ae3fae7601eff9adaad7
Maurice Lam [Sun, 15 Apr 2018 02:55:53 +0000 (19:55 -0700)]
Merge "Update fingerprint illustration" into pi-dev
am:
20bb2edda7
Change-Id: Ibd7a1835f7dd0de4ea6c6d0569b80eb8b6470155
Andrew Sapperstein [Sun, 15 Apr 2018 02:50:31 +0000 (19:50 -0700)]
Merge "Use the correct text for DND onboarding." into pi-dev
am:
15234d7eb4
Change-Id: Ib47f7f86998e4e070b7d4dc4abf6be563f2d6867
Salvador Martinez [Sun, 15 Apr 2018 02:28:54 +0000 (19:28 -0700)]
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev am:
1678488736
am:
230d6420b9
Change-Id: I5a05e1bf619b4999d3f329dcc6ce267dba95e598
Salvador Martinez [Sun, 15 Apr 2018 02:02:25 +0000 (19:02 -0700)]
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
am:
1678488736
Change-Id: I0ea6f839eb33ba147ebae657999164b872d57fb6
Salvador Martinez [Sun, 15 Apr 2018 01:20:29 +0000 (18:20 -0700)]
[automerger skipped] Merge "Update bluetooth preference to take user to new screen" into pi-dev am:
ce53cbeef7
am:
fbc5abb8e1 -s ours
Change-Id: Ia4d639f332780d767e17edc512b57027421ea275
Lifu Tang [Sun, 15 Apr 2018 01:19:52 +0000 (18:19 -0700)]
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev am:
6229c0f4eb
am:
531defb0b3
Change-Id: I2fe689240c8fc6bb4b24fc3428e0311d47dc1ad8
Salvador Martinez [Sun, 15 Apr 2018 01:19:25 +0000 (18:19 -0700)]
Merge "Add strings for AP band UI changes" into pi-dev am:
6baefa4b51
am:
0354854ab9
Change-Id: I5fe06ecc6c96d2cdff78fea1e93fe5dc28c3e587
Andrew Sapperstein [Sun, 15 Apr 2018 01:18:53 +0000 (18:18 -0700)]
Merge "Remove menu from Network & Internet screen." into pi-dev am:
23035d558a
am:
3fdfb99375
Change-Id: I88a8e8d7ee77bafb5b8180d6d882d1ed9c09bd1f
Salvador Martinez [Sun, 15 Apr 2018 00:36:20 +0000 (17:36 -0700)]
Merge "Update bluetooth preference to take user to new screen" into pi-dev
am:
ce53cbeef7
Change-Id: Ic37c4b30a82cefb4f888d5c5183b6f6bae2b67d2
Lifu Tang [Sun, 15 Apr 2018 00:35:27 +0000 (17:35 -0700)]
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev
am:
6229c0f4eb
Change-Id: I43b9fa6273ded8ec9b0b0928a9d02167c720d562
Salvador Martinez [Sun, 15 Apr 2018 00:34:56 +0000 (17:34 -0700)]
Merge "Add strings for AP band UI changes" into pi-dev
am:
6baefa4b51
Change-Id: I2fd9ae450a9cf1322338c080dedc40d7961f379d
Andrew Sapperstein [Sun, 15 Apr 2018 00:34:27 +0000 (17:34 -0700)]
Merge "Remove menu from Network & Internet screen." into pi-dev
am:
23035d558a
Change-Id: Ib7a25cfad474304683304778e4fa7d32a2bb187b
TreeHugger Robot [Sat, 14 Apr 2018 23:12:48 +0000 (23:12 +0000)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 04:33:12 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 14 Apr 2018 03:57:48 +0000 (20:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5292358d043bede11ff4791263b007d31b04d8b6
TreeHugger Robot [Sat, 14 Apr 2018 03:08:23 +0000 (03:08 +0000)]
Merge "Storage wizard string changes per UX request." into pi-dev
Bill Yi [Sat, 14 Apr 2018 02:53:43 +0000 (19:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cf53a9ffbc077211999a42f73bb41e5cbe78932
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 14 Apr 2018 01:36:27 +0000 (01:36 +0000)]
Merge "Update fingerprint illustration" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 01:34:34 +0000 (01:34 +0000)]
Merge "Use the correct text for DND onboarding." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 01:25:33 +0000 (01:25 +0000)]
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
Yohei Yukawa [Sat, 14 Apr 2018 01:13:09 +0000 (18:13 -0700)]
Remove the dependency on InputMethodSettings
InputMethodUtils.InputMethodSetting is a quite complicated inernal
class of InputMethodUtils and PhysicalKeyboardFragment's depending on
it just for getting/setting SHOW_IME_WITH_HARD_KEYBOARD is overkill.
With this CL, PhysicalKeyboardFragment just uses Secure Settings APIs
directly.
There should be no user-visible behavior change.
Bug:
77730201
Test: Manually verified as follows:
1. Open system settings.
2. Tap "System" -> "Languages & input" -> "Physical keyboard"
3. Make sure "Show virtual keyboard" is unchecked
4. Make sure the following command shows 0
adb shell settings get secure show_ime_with_hard_keyboard
5. Check "Show virtual keyboard"
6. Make sure the following command shows 1
adb shell settings get secure show_ime_with_hard_keyboard
7. Run the following command
adb shell settings put secure show_ime_with_hard_keyboard 0
8. Make sure "Show virtual keyboard" is chenged to unchecked
Change-Id: I956da5dad27313d6edf141f2320bb0a7954fbbea
Andrew Sapperstein [Sat, 14 Apr 2018 00:24:33 +0000 (17:24 -0700)]
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
TreeHugger Robot [Fri, 13 Apr 2018 23:00:52 +0000 (23:00 +0000)]
Merge "Update bluetooth preference to take user to new screen" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 22:54:18 +0000 (22:54 +0000)]
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev
Isha Bobra [Fri, 9 Feb 2018 00:09:39 +0000 (16:09 -0800)]
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
TreeHugger Robot [Fri, 13 Apr 2018 22:51:25 +0000 (22:51 +0000)]
Merge "Add strings for AP band UI changes" into pi-dev
Salvador Martinez [Fri, 13 Apr 2018 20:01:19 +0000 (13:01 -0700)]
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
Fan Zhang [Fri, 13 Apr 2018 22:25:32 +0000 (15:25 -0700)]
Use DateUtils to build account sync timestamp
Change-Id: I2158855bd2caba42f64d24ab2fb00c6b561e5cef
Fixes:
77913394
Test: visual
Salvador Martinez [Wed, 4 Apr 2018 21:23:57 +0000 (14:23 -0700)]
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
TreeHugger Robot [Fri, 13 Apr 2018 22:07:22 +0000 (22:07 +0000)]
Merge "Remove menu from Network & Internet screen." into pi-dev
Lei Yu [Fri, 13 Apr 2018 21:28:14 +0000 (14:28 -0700)]
Remove battery usage preference in app info page
Bug:
78011526
Test: RunSettingsRoboTests
Change-Id: I2dfb989167fe27857590f416fbb16d401e53bc1d
Jeff Sharkey [Fri, 13 Apr 2018 21:20:31 +0000 (15:20 -0600)]
Storage wizard string changes per UX request.
Bug:
77207119
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I93adf01442d006927c792db405d8cf73c963dd40
Salvador Martinez [Fri, 13 Apr 2018 21:19:49 +0000 (14:19 -0700)]
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
TreeHugger Robot [Fri, 13 Apr 2018 20:56:18 +0000 (20:56 +0000)]
Merge "Update bluetooth preference to take user to new screen"
Andrew Sapperstein [Fri, 13 Apr 2018 20:48:05 +0000 (13:48 -0700)]
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
Lifu Tang [Thu, 12 Apr 2018 17:01:29 +0000 (10:01 -0700)]
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
Bill Yi [Fri, 13 Apr 2018 20:29:17 +0000 (13:29 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
d57d27acab -s ours
am:
33c5997147 -s ours
Change-Id: I604148ac62fbd752d862d0c7329530fd852148c7
Doris Ling [Fri, 13 Apr 2018 20:26:16 +0000 (13:26 -0700)]
Merge "Hide Default apps and App permissions under Advanced." into pi-dev am:
36800c5115
am:
9095c97ee3
Change-Id: Id4ecbf4a24bb5f86f069d89103521043a7d0c09d
Bill Yi [Fri, 13 Apr 2018 20:03:28 +0000 (13:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d57d27acab -s ours
Change-Id: I7e6ada7ca49496e0480d020c879fe2dc0d762e51
Doris Ling [Fri, 13 Apr 2018 20:02:10 +0000 (13:02 -0700)]
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
am:
36800c5115
Change-Id: I15bba4d3ae39d5aca176890624048bbe14a1c59f
Daniel Nishi [Fri, 13 Apr 2018 20:01:55 +0000 (13:01 -0700)]
[automerger skipped] Merge "Warn users before they change device name." into pi-dev am:
cd01a3ecd9
am:
f47e1a3930 -s ours
Change-Id: Ibbf6d55d3051f6c45e41ecd74746224c624d8143
Daniel Nishi [Fri, 13 Apr 2018 19:51:10 +0000 (12:51 -0700)]
Merge "Warn users before they change device name." into pi-dev
am:
cd01a3ecd9
Change-Id: I75c974c944dcda55b19dc4566cdb56f9811d2212
TreeHugger Robot [Fri, 13 Apr 2018 19:44:37 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Doris Ling [Fri, 13 Apr 2018 19:44:11 +0000 (19:44 +0000)]
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
Daniel Nishi [Fri, 13 Apr 2018 19:31:15 +0000 (19:31 +0000)]
Merge "Warn users before they change device name." into pi-dev
Fan Zhang [Fri, 13 Apr 2018 19:10:46 +0000 (12:10 -0700)]
Merge "Support customizing icon color for externally items." into pi-dev am:
98a2064b61
am:
08becf87f4
Change-Id: I9392c7e8c00145437a2383864993a0b53791289b
Fan Zhang [Fri, 13 Apr 2018 18:40:26 +0000 (11:40 -0700)]
Merge "Support customizing icon color for externally items." into pi-dev
am:
98a2064b61
Change-Id: I501f26d19f66e42aaa8bbcad6a7c91895a24b443
Bill Yi [Fri, 13 Apr 2018 18:39:46 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I50e29a33b46f948023f4b85d1ebacb99397d6ec9
Salvador Martinez [Wed, 4 Apr 2018 21:23:57 +0000 (14:23 -0700)]
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
Change-Id: I036a3992bbd78896da8364b55ecc51afc4464b6e
TreeHugger Robot [Fri, 13 Apr 2018 17:48:22 +0000 (17:48 +0000)]
Merge "Support customizing icon color for externally items." into pi-dev
Lei Yu [Fri, 13 Apr 2018 17:10:52 +0000 (10:10 -0700)]
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev am:
e6825db406
am:
7f197d9c73
Change-Id: Ife74b5006b56e7c836af24b48b9350a779e72efa
Lei Yu [Fri, 13 Apr 2018 16:55:16 +0000 (09:55 -0700)]
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
am:
e6825db406
Change-Id: Ie9d2b695c2a86172154660430ea39a96cf66a9de
Lei Yu [Fri, 13 Apr 2018 16:42:08 +0000 (16:42 +0000)]
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
Fan Zhang [Thu, 12 Apr 2018 21:04:09 +0000 (14:04 -0700)]
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
HJ ChangLiao [Thu, 12 Apr 2018 08:29:33 +0000 (16:29 +0800)]
Register ConnectDeviceFrag with new key
For inject dynamic pref driving mode to
ConnectDeviceDashboardFragment,
Register this frag with new key CONNECT.
Bug:
72458929
Test: make RunSettingsRoboTests
Change-Id: I41781ff2f8918f7923c53defff85ddd4afe7056d
Lei Yu [Fri, 13 Apr 2018 01:57:37 +0000 (18:57 -0700)]
Merge "Log app versionCode in anomaly detection" into pi-dev am:
70bd0c6d00
am:
471b71fb1c
Change-Id: I1fd2e48ed8f5eff66e2e1c8c97255a1894059097
Bill Yi [Fri, 13 Apr 2018 01:47:07 +0000 (18:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
660e824061 -s ours
am:
a3733c5f25 -s ours
Change-Id: Icb4309782f75e2e33edfb5b6d40f9627e1188c0f
Fan Zhang [Fri, 13 Apr 2018 01:36:35 +0000 (18:36 -0700)]
[automerger skipped] Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev am:
f0c7038efe
am:
9bbb70ff85 -s ours
Change-Id: I15a739dc94cf5028b18ac4013023a7f74ac86f86
Lei Yu [Fri, 13 Apr 2018 01:11:28 +0000 (18:11 -0700)]
Merge "Log app versionCode in anomaly detection" into pi-dev
am:
70bd0c6d00
Change-Id: I72c442fe4ac8b0bd3c04a63d406e15342610bce0
ryanywlin [Fri, 13 Apr 2018 00:53:29 +0000 (17:53 -0700)]
Merge "Shuffle sound settings UI arrangment" into pi-dev am:
c22bada88a
am:
7c6dbcf0fc
Change-Id: Iaf6c26b7d636ac393545c3247ec67be852d42aaf
Lei Yu [Fri, 13 Apr 2018 00:35:11 +0000 (00:35 +0000)]
Merge "Log app versionCode in anomaly detection" into pi-dev
Bill Yi [Fri, 13 Apr 2018 00:28:48 +0000 (17:28 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
660e824061 -s ours
Change-Id: I18553a43f293c1d02a1a7d4a8c9e8c0d74fb9cb7
Fan Zhang [Fri, 13 Apr 2018 00:13:35 +0000 (17:13 -0700)]
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
am:
f0c7038efe
Change-Id: I200feacea89591edc0b446d59e6b4a23a5daa7cd
TreeHugger Robot [Fri, 13 Apr 2018 00:10:32 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Doris Ling [Fri, 13 Apr 2018 00:07:23 +0000 (17:07 -0700)]
Merge "Use a different string for vpn summary." into pi-dev am:
a9261b4136
am:
fe126d116b
Change-Id: Ia528e8bd3950776669f4b92f89729846d1bca719
ryanywlin [Thu, 12 Apr 2018 23:57:04 +0000 (16:57 -0700)]
Merge "Shuffle sound settings UI arrangment" into pi-dev
am:
c22bada88a
Change-Id: I3f02057b6c7faa902a6832f4ac8dc878e67ac786
Julia Reynolds [Thu, 12 Apr 2018 23:36:46 +0000 (16:36 -0700)]
Merge "Notification summary updates" into pi-dev am:
81c15c05c8
am:
bd9eb14472
Change-Id: I47911d0bb91bc3e00d17c28ca674f7d3c7fcdaa6
TreeHugger Robot [Thu, 12 Apr 2018 23:35:15 +0000 (23:35 +0000)]
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:16:28 +0000 (23:16 +0000)]
Merge "Shuffle sound settings UI arrangment" into pi-dev
Doris Ling [Thu, 12 Apr 2018 23:08:57 +0000 (16:08 -0700)]
Merge "Use a different string for vpn summary." into pi-dev
am:
a9261b4136
Change-Id: If11353a90933436bb1a2425e418369fc75d8a1ad
Daniel Nishi [Fri, 6 Apr 2018 01:24:13 +0000 (18:24 -0700)]
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
Daniel Nishi [Thu, 12 Apr 2018 22:38:57 +0000 (22:38 +0000)]
Merge "Warn users before they change device name."
Doris Ling [Thu, 12 Apr 2018 22:31:32 +0000 (15:31 -0700)]
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
TreeHugger Robot [Thu, 12 Apr 2018 22:28:25 +0000 (22:28 +0000)]
Merge "Switch from SI to IEC unit when formatting data usage bytes"
TreeHugger Robot [Thu, 12 Apr 2018 22:26:54 +0000 (22:26 +0000)]
Merge "Use a different string for vpn summary." into pi-dev
Julia Reynolds [Thu, 12 Apr 2018 22:24:29 +0000 (15:24 -0700)]
Merge "Notification summary updates" into pi-dev
am:
81c15c05c8
Change-Id: I110a4696b24a7fc58ced05f15a6b9c2728c7247c
Bill Yi [Thu, 12 Apr 2018 22:16:40 +0000 (15:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Bug:
77897542
Change-Id: Ibe6564030f06ca559f4f4353c88746b8ab775da7
ryanywlin [Thu, 12 Apr 2018 21:51:46 +0000 (05:51 +0800)]
Shuffle sound settings UI arrangment
- Move "Ring volume" and "also viberate for calls" below to "Media volume"
- Add divider between "Media volume" and "Ring volume"
- Add divider between "also viberate for calls" and "Alarm volume"
Bug:
74130772
Test: rebuild
Change-Id: Ie274c0174d828a0804b8551760c407579585bd1b
OSDN Git Service
