Yoshinori Hirano
c55ca0bf56
Tell SIMs apart in Data usage settings in multi-SIM case
...
In multi-SIM case, multiple "Mobile" categories are shown in Data usage
settings. To fix this issue, SubscriptionInfo#getDisplayName() should be
used instead of "Mobile".
Fixes: 62779261
Test: manual - go to Settings > Network & Internet > Data usage
Author: Wu Qiang <qiang.x.wu@sonymobile.com >
Change-Id: I4d95eceb24efd78ea3f3782d3a613edd2cf37d65
2017-06-21 12:10:11 -07:00
Ajay Kumar Nadathur Sreenivasan
28c4a576d3
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev am: f5b77d65b4
...
am: c14e0660a7
2017-06-21 16:46:44 +00:00
Ajay Kumar Nadathur Sreenivasan
c14e0660a7
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev
...
am: f5b77d65b4
2017-06-21 16:44:14 +00:00
Ajay Kumar Nadathur Sreenivasan
f5b77d65b4
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev
2017-06-21 16:39:50 +00:00
jackqdyulei
a7af391196
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev am: b010eed05d
...
am: f60c265a11
2017-06-21 03:35:36 +00:00
Doris Ling
6b10f016c5
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev am: 153e2b89b9
...
am: 33b2f7f466
2017-06-21 03:35:04 +00:00
Kevin Chyn
6d0725d6a1
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev am: 58f668ef6b
...
am: 8dbfc66a74
2017-06-21 03:29:23 +00:00
jackqdyulei
f60c265a11
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
...
am: b010eed05d
2017-06-21 03:25:43 +00:00
Doris Ling
33b2f7f466
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
...
am: 153e2b89b9
2017-06-21 03:23:34 +00:00
TreeHugger Robot
b010eed05d
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
2017-06-21 03:16:33 +00:00
TreeHugger Robot
153e2b89b9
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
2017-06-21 03:14:29 +00:00
Kevin Chyn
8dbfc66a74
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
...
am: 58f668ef6b
2017-06-21 03:02:36 +00:00
TreeHugger Robot
58f668ef6b
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
2017-06-21 02:52:01 +00:00
Lei Yu
fe8de086ac
Merge "Update anomaly High usage" into oc-dr1-dev am: 50062193c4
...
am: 216710961b
2017-06-21 01:10:28 +00:00
Lei Yu
5d4890d7be
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev am: 65afc6f86b
...
am: 76b09dfae5
2017-06-21 01:09:45 +00:00
Lei Yu
216710961b
Merge "Update anomaly High usage" into oc-dr1-dev
...
am: 50062193c4
2017-06-21 01:06:55 +00:00
Lei Yu
50062193c4
Merge "Update anomaly High usage" into oc-dr1-dev
2017-06-21 01:03:42 +00:00
Lei Yu
76b09dfae5
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
...
am: 65afc6f86b
2017-06-21 01:02:56 +00:00
Lei Yu
65afc6f86b
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
2017-06-21 00:51:31 +00:00
Kevin Chyn
2aecf00ef1
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev am: b4bbc52e27
...
am: 57d52c6b50
2017-06-20 23:47:27 +00:00
Fan Zhang
f18fa145f2
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev am: 58d27eef9a
...
am: 1d3f5e55cd
2017-06-20 23:44:21 +00:00
Kevin Chyn
57d52c6b50
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
...
am: b4bbc52e27
2017-06-20 23:38:12 +00:00
TreeHugger Robot
b4bbc52e27
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
2017-06-20 23:36:27 +00:00
Fan Zhang
1d3f5e55cd
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
...
am: 58d27eef9a
2017-06-20 23:34:24 +00:00
jackqdyulei
485acbd26c
Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918 am: 9d0d6e4fcc
...
am: 4b5a6a5284
2017-06-20 23:29:53 +00:00
jackqdyulei
1a1a223f7c
Merge "Refine Anomaly detail page" into oc-dr1-dev am: aad82fa4ee
...
am: 4d75698dac
2017-06-20 23:29:33 +00:00
TreeHugger Robot
58d27eef9a
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
2017-06-20 23:23:40 +00:00
jackqdyulei
4b5a6a5284
Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
...
am: 9d0d6e4fcc
2017-06-20 23:05:34 +00:00
jackqdyulei
9d0d6e4fcc
Merge "Hide wifi and bt in battery settings" into oc-dev
...
am: 05777a7918
2017-06-20 22:55:47 +00:00
jackqdyulei
4d75698dac
Merge "Refine Anomaly detail page" into oc-dr1-dev
...
am: aad82fa4ee
2017-06-20 22:36:50 +00:00
TreeHugger Robot
05777a7918
Merge "Hide wifi and bt in battery settings" into oc-dev
2017-06-20 22:35:59 +00:00
TreeHugger Robot
aad82fa4ee
Merge "Refine Anomaly detail page" into oc-dr1-dev
2017-06-20 22:14:55 +00:00
Kevin Chyn
00d21e3c75
FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT
...
Fixes: 62681560
Test: open fingerprint settings, use an unenrolled fingerprint to
authenticate 20 times in a row. Look at logs and it shouldn't be flooded
with fingerprint logs
Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988
2017-06-20 14:24:43 -07:00
jackqdyulei
27792b2356
Only update anomaly icon in AnomalyLoader
...
Before this cl, it will re-calculate battery percentage once we get
anomaly data, which will add screen usage data twice. This cl make it
only update anomaly icon after the anomaly detection is done.
Bug: 62803379
Test: RunSettingsRoboTests
Change-Id: I2089646679e299fa948b1f3ed21f4a13a1317aa3
2017-06-20 13:53:46 -07:00
jackqdyulei
d10608dfbb
Hide wifi and bt in battery settings
...
Hide them in app usage list but don't smear them
Bug: 62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
2017-06-20 13:44:52 -07:00
Maurice Lam
299985fe75
Merge "Read setup wizard theme from system properties" into oc-dr1-dev am: 1fe5766e30
...
am: 7a665455de
2017-06-20 20:11:58 +00:00
Maurice Lam
7a665455de
Merge "Read setup wizard theme from system properties" into oc-dr1-dev
...
am: 1fe5766e30
2017-06-20 20:07:30 +00:00
Doris Ling
1ffda54c00
Merge "Add Account.name to the tile's intent."
2017-06-20 19:07:54 +00:00
jackqdyulei
853ab1f891
Update anomaly High usage
...
Update the title and summary for anomaly summary preference.
Bug: 62791930
Test: RunSettingsRoboTests
Change-Id: I30ac554f227904c102d0903505e3a99966f50581
2017-06-20 11:40:29 -07:00
jackqdyulei
72c3275a66
Refine Anomaly detail page
...
1. Fix the layout issue(title not vertical horizontal)
2. Add subtitle for anomaly
Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I9b3627f09bbe37b104644d203ff8924f0faaea47
2017-06-20 11:37:55 -07:00
Kevin Chyn
41acc69edf
Enable Assist Gesture Settings to launch from action intent
...
Bug: 62540322
Test: adb shell am start -a android.settings.ASSIST_GESTURE_SETTINGS
Change-Id: I0aa0cc3ba87412626f6c24639efdd5e622b995e7
2017-06-20 11:07:46 -07:00
Fan Zhang
a74337c627
Add logging when entity header buttons are clicked
...
Change-Id: I673e5b4a6c5f8736bbec72e259a82acb3f514828
Fix: 62709062
Test: make RunSettingsRoboTests
2017-06-20 16:53:14 +00:00
Sean Stout
2bc94d6271
Add Night Light Suggestion and tests
...
Night Light settings suggestion will only show when the user
has not previously interacted with Night Light.
Bug: 37207263
Test: make ROBOTEST_FILTER=\
"(SettingsSuggestionsTest|SuggestionFeatureProviderImplTest)"\
RunSettingsRoboTests
Change-Id: I432d5fef19f5e4a52503da136b044598cb82164a
2017-06-20 09:22:56 -07:00
Maurice Lam
7ffdb046a6
Read setup wizard theme from system properties
...
Test: cd tests/robotests && mma
Bug: 62060286
Change-Id: I285638736efa63314fa3e055f72ac021bce40bfe
2017-06-20 00:25:50 +00:00
Ajay Nadathur
a5f7392d51
Add missing 'pin' screen lock option
...
bug: 62206837
Test: Manual verified; Existing tests pass
Change-Id: I65985427cb012668ee23bedaf7253bec7c83fe75
2017-06-19 17:23:55 -07:00
Fan Zhang
c97e9bc39d
Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am: 6dfafa5d95
...
am: f66702c930
2017-06-19 23:45:43 +00:00
Fan Zhang
f66702c930
Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
...
am: 6dfafa5d95
2017-06-19 23:33:13 +00:00
TreeHugger Robot
6dfafa5d95
Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
2017-06-19 23:21:13 +00:00
TreeHugger Robot
2611734af5
Merge "Keep candidates in radio button picker UI ordered"
2017-06-19 23:07:19 +00:00
Lei Yu
416c0ba7c2
Merge "Hook up bt related knobs to AnomalyDetectionPolicy" into oc-dr1-dev am: 43ea43a6e5
...
am: 03ea4110ae
2017-06-19 21:45:40 +00:00
