Maurice Lam
554c95fbb1
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c
...
am: 15bcab49f7
2017-06-22 21:36:47 +00:00
Doris Ling
296bdda5df
Merge "Update summary for Recent Apps." into oc-dr1-dev am: d7fc071f48
...
am: dc361053a0
2017-06-22 21:34:40 +00:00
Maurice Lam
15bcab49f7
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
...
am: cf3130338c
2017-06-22 20:02:48 +00:00
TreeHugger Robot
cf3130338c
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
2017-06-22 19:58:51 +00:00
Doris Ling
dc361053a0
Merge "Update summary for Recent Apps." into oc-dr1-dev
...
am: d7fc071f48
2017-06-22 19:57:20 +00:00
TreeHugger Robot
03849d1484
Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"
2017-06-22 19:49:35 +00:00
TreeHugger Robot
d7fc071f48
Merge "Update summary for Recent Apps." into oc-dr1-dev
2017-06-22 19:39:10 +00:00
TreeHugger Robot
176506e54c
Merge "Catch invalid extra when launching help trampoline."
2017-06-22 19:23:45 +00:00
TreeHugger Robot
21e6b40a0f
Merge "Move Apps & notifications -> App permissions into Advanced."
2017-06-22 19:23:21 +00:00
Salvador Martinez
bbb5ed60bf
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev am: ed66c5fcdf
...
am: 23888a246b
2017-06-22 18:50:40 +00:00
Salvador Martinez
23888a246b
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
...
am: ed66c5fcdf
2017-06-22 18:47:11 +00:00
TreeHugger Robot
ed66c5fcdf
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
2017-06-22 18:42:16 +00:00
Fan Zhang
d96f3bf04e
Catch invalid extra when launching help trampoline.
...
Change-Id: Ifb4b6fefe507cf403065436fca7a46d3a00afda7
Fix: 62821816
Test: robotests
2017-06-22 10:34:07 -07:00
Salvador Martinez
cb9c53dd7c
Fix BatteryInfo using enhanced estimate for charge time
...
Due to a typo in BatteryEstimates the enhanced estimate we use
for discharging would also be used for charging. This CL corrects
the typo and adds a simple test to catch a similar mistake in the
future. We were also always loading the enhanced estimate even when
we were not using it. As a ~*bonus*~ it should also help improve
the speed of the charging use case for this screen and fixes an
issue with the battery not switching to the charging icon in the
main battery page.
Test: robotest
Bug: 62738028
Bug: 62873396
Bug: 62784575
Bug: 62736144
Change-Id: Ib2cbdeea22afb7da590b701b84f526bdac243410
2017-06-22 09:42:36 -07:00
TreeHugger Robot
68722d4add
Merge "Notification settings to match ixd mocks: - added default sound config to general notification settings page - reordered items to match docs"
2017-06-22 16:29:19 +00:00
Marie Janssen
5e50f15249
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520 am: 3cc4522cbc
...
am: 852c930bfd
2017-06-22 15:48:58 +00:00
Marie Janssen
852c930bfd
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520
...
am: 3cc4522cbc
2017-06-22 15:46:01 +00:00
Marie Janssen
3cc4522cbc
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
...
am: 620fe71520
2017-06-22 15:41:55 +00:00
Alison Cichowlas
4fe455de57
Notification settings to match ixd mocks:
...
- added default sound config to general notification settings page
- reordered items to match docs
Bug: 37481153
Test: RunSettingsRoboTests; manual
Change-Id: I2404f0a3f97601c8b3a9d15de58e1d53bf801c45
2017-06-22 10:44:27 -04:00
Juan Lang
5bc7075d48
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
...
am: d392a9bfbb
2017-06-22 14:17:37 +00:00
Juan Lang
d392a9bfbb
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
2017-06-22 14:05:56 +00:00
Roozbeh Pournader
1587224193
Switch Utils.formatElapsedTime to use ICU's MeasureFormat
...
Previously, localizable strings were used instead, causing various
difficulties and inconsistencies.
Now we use ICU's MeasureFormat. The results for English are almost
identical to the previous results (see below), and we also get higher
quality and better-vetted results for other locales.
Note: This also makes formatted strings shorter by eliminating zeros.
For example, what was previously shown as "2d 0h 15m" is now shown as
"2d 15m".
Bug: 36994779
Bug: 37701311
Test: make -j RunSettingsRoboTests
Change-Id: I78fd09e4e7f63f41ef88d3d3fc4ba2be15e1d812
2017-06-21 21:04:37 -07:00
Doris Ling
c225ee4e0a
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev am: ee947e9a31
...
am: 11a93be4a7
2017-06-22 01:43:56 +00:00
Doris Ling
11a93be4a7
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
...
am: ee947e9a31
2017-06-22 01:40:58 +00:00
Maurice Lam
34a181aceb
Create add more fingerprint suggestion for setup
...
Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.
Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755
2017-06-21 17:17:48 -07:00
Doris Ling
fa58cfca6e
Refresh the dashboard UI when swiping away the only suggestion.
...
In the new suggestion UI, the suggestions are listed inside the
suggestion container instead of individual dashboard items. When there
is only a single suggestion shown, and that is being swiped away, the
actual list for the suggestions will handle the swipe and remove that
list item from the list. However, the top level container will remain
until next time the dashboard list is being refreshed. Explicitly set
the suggestions to null to force refreshing of the dashboard UI.
Change-Id: I37f8c8f5a813a5c56f4f2f46103fdbb66ce97fcd
Fix: 62639824
Test: make RunSettingsRoboTests
2017-06-21 15:37:31 -07:00
Juan Lang
c04c3f7bd7
Use SettingsLib's versions of Custom* classes.
...
Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
2017-06-21 14:47:37 -07:00
Juan Lang
d5d43ddc77
Merge "Use SettingsLib's versions of Custom* classes."
2017-06-21 21:25:19 +00:00
TreeHugger Robot
7dc5e8242f
Merge "Tell SIMs apart in Data usage settings in multi-SIM case"
2017-06-21 21:05:42 +00:00
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
Juan Lang
4482812cb1
Use SettingsLib's versions of Custom* classes.
...
Test: make RunSettingsRoboTests
Change-Id: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
2017-06-21 12:07:50 -07:00
Daniel Nishi
b6360d932b
Merge "Don't accordion the progress bar out." into oc-dr1-dev am: 648e31c283
...
am: 7ffa9b3a7b
2017-06-21 18:28:53 +00:00
Daniel Nishi
7ffa9b3a7b
Merge "Don't accordion the progress bar out." into oc-dr1-dev
...
am: 648e31c283
2017-06-21 18:26:22 +00:00
Daniel Nishi
648e31c283
Merge "Don't accordion the progress bar out." into oc-dr1-dev
2017-06-21 18:21:20 +00:00
Lei Yu
d33cf5e37d
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev am: 2e34b94817
...
am: 5445997519
2017-06-21 18:03:51 +00:00
Matthew Fritze
d56bf722f6
Merge "Block inline-results from Settings search" into oc-dr1-dev am: bea9a5d739
...
am: eeec8eecc0
2017-06-21 18:03:00 +00:00
Lei Yu
5445997519
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
...
am: 2e34b94817
2017-06-21 17:49:50 +00:00
Lei Yu
2e34b94817
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
2017-06-21 17:44:44 +00:00
Matthew Fritze
eeec8eecc0
Merge "Block inline-results from Settings search" into oc-dr1-dev
...
am: bea9a5d739
2017-06-21 17:42:48 +00:00
TreeHugger Robot
bea9a5d739
Merge "Block inline-results from Settings search" into oc-dr1-dev
2017-06-21 17:26:10 +00:00
Salvador Martinez
759fab17a4
Merge "Add info string to advanced battery usage page" into oc-dr1-dev am: 94d0a9c554
...
am: 776fe841f9
2017-06-21 17:11:47 +00:00
Salvador Martinez
776fe841f9
Merge "Add info string to advanced battery usage page" into oc-dr1-dev
...
am: 94d0a9c554
2017-06-21 17:06:35 +00:00
Salvador Martinez
94d0a9c554
Merge "Add info string to advanced battery usage page" into oc-dr1-dev
2017-06-21 17:02:32 +00: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
