Lei Yu
837f279db9
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev am: e6825db406
...
am: 7f197d9c73
Change-Id: Ife74b5006b56e7c836af24b48b9350a779e72efa
2018-04-13 10:10:52 -07: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
HJ ChangLiao
c338e265aa
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
2018-04-13 12:37:55 +08:00
Lei Yu
cc9c84646c
Merge "Log app versionCode in anomaly detection" into pi-dev am: 70bd0c6d00
...
am: 471b71fb1c
Change-Id: I1fd2e48ed8f5eff66e2e1c8c97255a1894059097
2018-04-12 18:57:37 -07:00
Bill Yi
2297358241
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 660e824061
-s ours
...
am: a3733c5f25
-s ours
Change-Id: Icb4309782f75e2e33edfb5b6d40f9627e1188c0f
2018-04-12 18:47:07 -07:00
Fan Zhang
468ab3663e
[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
2018-04-12 18:36:35 -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
ryanywlin
6910e6db44
Merge "Shuffle sound settings UI arrangment" into pi-dev am: c22bada88a
...
am: 7c6dbcf0fc
Change-Id: Iaf6c26b7d636ac393545c3247ec67be852d42aaf
2018-04-12 17:53:29 -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
Doris Ling
f045113476
Merge "Use a different string for vpn summary." into pi-dev am: a9261b4136
...
am: fe126d116b
Change-Id: Ia528e8bd3950776669f4b92f89729846d1bca719
2018-04-12 17:07:23 -07: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
Julia Reynolds
2b165aa6ae
Merge "Notification summary updates" into pi-dev am: 81c15c05c8
...
am: bd9eb14472
Change-Id: I47911d0bb91bc3e00d17c28ca674f7d3c7fcdaa6
2018-04-12 16:36:46 -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
Daniel Nishi
494a9020ff
Merge "Warn users before they change device name."
2018-04-12 22:38:57 +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
287f84d1ed
Merge "Switch from SI to IEC unit when formatting data usage bytes"
2018-04-12 22:28:25 +00:00
TreeHugger Robot
a9261b4136
Merge "Use a different string for vpn summary." into pi-dev
2018-04-12 22:26:54 +00:00
Julia Reynolds
bd9eb14472
Merge "Notification summary updates" into pi-dev
...
am: 81c15c05c8
Change-Id: I110a4696b24a7fc58ced05f15a6b9c2728c7247c
2018-04-12 15:24:29 -07:00
Bill Yi
66384012c5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Bug: 77897542
Change-Id: Ibe6564030f06ca559f4f4353c88746b8ab775da7
2018-04-12 22:19:49 +00:00
ryanywlin
751a3953da
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
2018-04-13 05:55:04 +08:00
Lei Yu
023b1e088a
Merge changes from topic "anomaly_system_app" into pi-dev am: dc8fff76f3
...
am: 9122efebac
Change-Id: I384476edcb6ca9702a2895f6f5f4b55eb11cc86f
2018-04-12 14:12:13 -07:00
Lei Yu
2281b1f600
Change "Advanced battery usage" to "Battery usage"
...
Also update the char limit to 25 to make it less impossible
to happen in other language.
Bug: 77649015
Test: Screenshot
Change-Id: I4cdbfc576660aacaeff019bbbb88abb42af63daa
2018-04-12 14:04:35 -07:00
Doris Ling
0a66946d6b
Use a different string for vpn summary.
...
- for legacy vpn config, we do not get the vpn name to show in the
preference summary, and we used to simply show "Connected" as the summary
text. However, the string was changed to include the connected device
name as the parameter. Change to use connected summary string that does
not requires any parameter.
Change-Id: Ia6191eb315f5f23e0e6bf8da2a9537c211e8188e
Fixes: 77618408
Test: make RunSettingsRoboTests
2018-04-12 14:04:10 -07:00
hughchen
5694e855b5
[automerger skipped] Merge "Implement previously connected device UI" into pi-dev am: 3e644756c3
...
am: 67110f471e
-s ours
Change-Id: I90eabbfa8cd5cccee3a6ddacd4039d11bb068e43
2018-04-12 13:53:25 -07:00
Lei Yu
9122efebac
Merge changes from topic "anomaly_system_app" into pi-dev
...
am: dc8fff76f3
Change-Id: Icd9367fc1d43ce535fbd296f71f024ff68389eaa
2018-04-12 13:52:42 -07:00
TreeHugger Robot
81c15c05c8
Merge "Notification summary updates" into pi-dev
2018-04-12 20:43:10 +00:00
CY Cheng
f7e01e1294
Merge "Refactor airplane mode preference controller." into pi-dev am: 0375bbc709
...
am: 3d3e2609bc
Change-Id: I5e681d39a118bd88915815e4a27b561b57425171
2018-04-12 13:40:34 -07:00
hughchen
67110f471e
Merge "Implement previously connected device UI" into pi-dev
...
am: 3e644756c3
Change-Id: I69c161005b7ec39fddc0e9784d41a6b5dac11d6d
2018-04-12 13:40:02 -07:00
Matthew Fritze
bcb5bdf06c
Merge "Uniquely identify Slice intents" into pi-dev am: 45b6a9498c
...
am: 2fbb71614c
Change-Id: Iadb98d5cd4943a4762d1f2240d1d2a0f3dcc35e2
2018-04-12 13:31:55 -07:00
CY Cheng
3d3e2609bc
Merge "Refactor airplane mode preference controller." into pi-dev
...
am: 0375bbc709
Change-Id: I63f97d6ad20cd0e4191d5d14559046ccfc6baf89
2018-04-12 12:09:34 -07:00
TreeHugger Robot
dc8fff76f3
Merge changes from topic "anomaly_system_app" into pi-dev
...
* changes:
Add method to check if app has launcher activity
Add system app check for anomaly detection.
2018-04-12 18:50:23 +00:00
TreeHugger Robot
3e644756c3
Merge "Implement previously connected device UI" into pi-dev
2018-04-12 18:23:58 +00:00
Matthew Fritze
2fbb71614c
Merge "Uniquely identify Slice intents" into pi-dev
...
am: 45b6a9498c
Change-Id: I92b23fdb335364c3c5f5a7e5fb7c2936a7ec1b33
2018-04-12 10:55:15 -07:00
Julia Reynolds
f5d1f165eb
Notification summary updates
...
- Fix app info summary
- Add configure notifications summary
Test: make -j RunSettingsRoboTests
Change-Id: Ic3c3036ee903fe7403032925a8145693807793d5
Fixes: 77598357
Fixes: 73018368
2018-04-12 13:49:34 -04:00
TreeHugger Robot
0375bbc709
Merge "Refactor airplane mode preference controller." into pi-dev
2018-04-12 17:44:04 +00:00
TreeHugger Robot
45b6a9498c
Merge "Uniquely identify Slice intents" into pi-dev
2018-04-12 17:38:52 +00:00
Lei Yu
63795b2f5c
Log app versionCode in anomaly detection
...
Change-Id: Ie760a4156b14b739279aa398bd1d2b8485449e91
Fixes: 77919142
Test: RunSettingsRoboTests
2018-04-12 10:32:08 -07:00
hughchen
aa31bd43a3
Implement previously connected device UI
...
* Move save device group to "Previously connected devices"
Bug: 74134939
Test: make -j60 RunSettingsRoboTests
Change-Id: Iff7894033df402d42dcc0ccaea6db3106edb7013
Merged-In: Iff7894033df402d42dcc0ccaea6db3106edb7013
2018-04-12 17:10:40 +00:00
Lei Yu
7d09e2ea68
Add method to check if app has launcher activity
...
This method should only used for system apps.
Change-Id: Id4109d8e223933269b8dae3aaa91b8a9186c527c
Fixes: 77477987
Test: RunSettingsRoboTests
2018-04-12 10:01:42 -07:00
TreeHugger Robot
f57f6aa9c7
Merge "Implement previously connected device UI"
2018-04-12 17:00:25 +00:00
Fan Zhang
289677f97f
Switch from SI to IEC unit when formatting data usage bytes
...
- Created a new helper method DataUsageUtils.formatDataUsage() to
format data usage bytes using IEC formatting.
- Switch from Formatter.formatFileSize() to DataUsageUtils.formatDataUsage()
everywhere in datausage package.
Change-Id: I9323beed8bf5126b153fc9a3cdd9591c97ca6fd2
Bug: 76159924
Test: robotests
2018-04-12 09:52:35 -07:00
Jason Chang
a29ed7ef71
Merge "[SettingsLib] Update Utils APIs usage"
2018-04-12 12:44:04 +00:00