OSDN Git Service
TreeHugger Robot [Wed, 24 May 2017 19:08:47 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE"
jackqdyulei [Fri, 19 May 2017 21:42:24 +0000 (14:42 -0700)]
Add background activity action
Background activity action is designed for wakeup alarm anomaly.
This cl also change the parameter in anomaly action interface
from "packageName" to "anomaly"
Bug:
36921529
Test: RunSettingsRoboTests
Change-Id: Ibde69f351f81043641f228f0e74deaa2e230c08a
Matthew Fritze [Wed, 24 May 2017 17:18:58 +0000 (17:18 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev am:
ae0886c9f7
am:
934a04509f
Change-Id: Iff239e99df07cf425f650fbdb9cfb72a3fc40182
Matthew Fritze [Wed, 24 May 2017 17:16:01 +0000 (17:16 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am:
ae0886c9f7
Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
TreeHugger Robot [Wed, 24 May 2017 17:12:34 +0000 (17:12 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
Tony Mak [Wed, 24 May 2017 10:56:22 +0000 (10:56 +0000)]
Merge "Show app battery usage in correct user" into oc-dev am:
7226c9f4c4
am:
f7c007b2c1 -s ours
Change-Id: I77d663cdd0c9dc6a3a411789591421a238a76766
Tony Mak [Wed, 24 May 2017 10:53:25 +0000 (10:53 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
am:
7226c9f4c4
Change-Id: I719a19c92d9671e471b648aa6db9881dbd01ad30
TreeHugger Robot [Wed, 24 May 2017 10:49:11 +0000 (10:49 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 04:48:41 +0000 (04:48 +0000)]
Merge "Update Settings search result unique ids"
jackqdyulei [Wed, 24 May 2017 01:40:32 +0000 (01:40 +0000)]
Merge "Split loading process for battery header" into oc-dev am:
987ee5338a
am:
c0351e0243 -s ours
Change-Id: Ia38ba8d7710511d740d4427674dd9f8f1a917abf
jackqdyulei [Wed, 24 May 2017 01:33:01 +0000 (01:33 +0000)]
Merge "Split loading process for battery header" into oc-dev
am:
987ee5338a
Change-Id: I395b493338f0225bd300e155d3303a1ba9136555
TreeHugger Robot [Wed, 24 May 2017 01:25:13 +0000 (01:25 +0000)]
Merge "Misc fixes to search and UI."
TreeHugger Robot [Wed, 24 May 2017 01:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev
jackqdyulei [Wed, 24 May 2017 01:01:41 +0000 (01:01 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev am:
4e0f69c10c
am:
6870de6772
Change-Id: I184acec76978463b3d62a6eedadd456ee6fa7a89
jackqdyulei [Wed, 24 May 2017 00:54:40 +0000 (00:54 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
am:
4e0f69c10c
Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
TreeHugger Robot [Wed, 24 May 2017 00:49:48 +0000 (00:49 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
Bill Yi [Wed, 24 May 2017 00:25:46 +0000 (00:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
20748da300 -s ours
am:
d327ad395b -s ours
Change-Id: I2b8b6ab846ae003a25695289b448dce7a2374bbe
Bill Yi [Wed, 24 May 2017 00:19:39 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
20748da300 -s ours
Change-Id: Ife6fcaa53d906080248b0cb63e8a32ae3a373793
TreeHugger Robot [Wed, 24 May 2017 00:10:58 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 23:29:25 +0000 (23:29 +0000)]
Merge "Center icons in Settings homepage and search result page."
Lei Yu [Tue, 23 May 2017 23:24:30 +0000 (23:24 +0000)]
Merge "Make "Battery usage" accessible at any time"
jackqdyulei [Fri, 19 May 2017 20:29:09 +0000 (13:29 -0700)]
Split loading process for battery header
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.
This is the best we can do to avoid ui flashing while removing the
animation
Bug:
38349587
Test: RunSettingsRoboTests
Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Lei Yu [Tue, 23 May 2017 23:20:53 +0000 (23:20 +0000)]
Merge "Split loading process for battery header"
Matthew Fritze [Fri, 12 May 2017 22:59:19 +0000 (15:59 -0700)]
Update Settings search result unique ids
- SearchResult stableIds are now DocIds from the database
- DocIds are data reference key's hash, when the key is not
empty or null
- Otherwise, DocIds are a hashcode from a set of fields.
Change-Id: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
Fixes:
37327194
Test: make RunSettingsRoboTest
TreeHugger Robot [Tue, 23 May 2017 22:38:20 +0000 (22:38 +0000)]
Merge "Update intent priority for AdvancedAppsActivity."
Matthew Fritze [Tue, 23 May 2017 22:27:01 +0000 (22:27 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev am:
96a8dffafb
am:
c9f9961d8d -s ours
Change-Id: Ia3d2431248eb95bcea9f1b95602e3ba6a2ef0171
Lei Yu [Tue, 23 May 2017 22:22:20 +0000 (22:22 +0000)]
Merge "Add flag for wakeup alarm"
Matthew Fritze [Tue, 23 May 2017 22:21:18 +0000 (22:21 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
am:
96a8dffafb
Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
jackqdyulei [Tue, 23 May 2017 21:30:47 +0000 (14:30 -0700)]
Update the strings for "show all apps"
Bug:
38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
TreeHugger Robot [Tue, 23 May 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
Bill Yi [Tue, 23 May 2017 22:05:15 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import
Matthew Fritze [Tue, 23 May 2017 21:02:57 +0000 (21:02 +0000)]
Revert "Revert "Replace dynamic summary text for SettingPref""
This reverts commit
8061aaef621b38e269eaa34c0cfef48a9b7eb288.
Test: make RunSettingsRoboTests
Fixes:
36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
Bill Yi [Tue, 23 May 2017 21:58:55 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I406d8bccbdbe16ecc32fbc0f1d8092167d6e957d
Auto-generated-cl: translation import
Fan Zhang [Tue, 23 May 2017 17:46:54 +0000 (10:46 -0700)]
Misc fixes to search and UI.
- Use prefContext to create preference.
- rename "Gestures" to "Gesture shortcuts"
- Add search keyword to individual gesture settings so when search
"gesture" they also show up.
- call super() for all getNonIndexableKeys() in search provider
Fix:
38327387
Fix:
36621897
Fix:
36685646
Test: make RunSettingsRoboTests
Change-Id: Ia5ddfeae08cb27c278dfb8d2376594e21d8f283c
Fan Zhang [Tue, 23 May 2017 21:23:07 +0000 (14:23 -0700)]
Center icons in Settings homepage and search result page.
Change-Id: I1846439bfa6c22c36a1574c759b32b00a02f9c8a
Fix:
38137170
Test: visual
Felipe Leme [Tue, 23 May 2017 21:04:55 +0000 (21:04 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev am:
3cf690e906
am:
150fa397fc
Change-Id: Ibbc7d59b6db0f1b991266f5e41f8daf79f71e6ca
Felipe Leme [Tue, 23 May 2017 20:57:34 +0000 (20:57 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
am:
3cf690e906
Change-Id: Ia76b7b27c3697645b58ee705733211b85a4dca40
Matthew Fritze [Mon, 22 May 2017 20:31:54 +0000 (13:31 -0700)]
Remove search2 package and put everything into search
Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b
Fixes:
38502743
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 23 May 2017 20:44:08 +0000 (20:44 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
jackqdyulei [Tue, 23 May 2017 17:57:35 +0000 (10:57 -0700)]
Add flag for wakeup alarm
Also hook up it to WakeupAlarmAnomalyDetector
Bug:
38233931
Test: RunSettingsRoboTests
Change-Id: Iceae37dcd2e6a6f1a044fa36efb416f11703c431
jackqdyulei [Mon, 22 May 2017 22:40:19 +0000 (15:40 -0700)]
Make "Battery usage" accessible at any time
Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.
Bug:
38497822
Test: RunSettingsRoboTests
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
jackqdyulei [Fri, 19 May 2017 20:29:09 +0000 (13:29 -0700)]
Split loading process for battery header
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.
This is the best we can do to avoid ui flashing while removing the
animation
Bug:
38349587
Test: RunSettingsRoboTests
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
TreeHugger Robot [Tue, 23 May 2017 19:17:25 +0000 (19:17 +0000)]
Merge "Remove duplicates in Security Settings"
TreeHugger Robot [Tue, 23 May 2017 18:48:49 +0000 (18:48 +0000)]
Merge "Add summary text to Apps & notifications -> Notifications"
Doris Ling [Tue, 23 May 2017 18:26:59 +0000 (11:26 -0700)]
Update intent priority for AdvancedAppsActivity.
On Apps & notifications screen, Default apps and Apps permissions
have the same prefence order, and hence they are displayed by the
ordering of the preference title. Explicitly move Default app below
App permissions.
Change-Id: Ia3515f65bcb6ac1704dc15127adc3296e50369ef
Fix:
37975409
Test: manual
TreeHugger Robot [Tue, 23 May 2017 18:12:16 +0000 (18:12 +0000)]
Merge "Hook up the anomaly policy to wakelockanomaly"
TreeHugger Robot [Tue, 23 May 2017 18:08:07 +0000 (18:08 +0000)]
Merge "Add wakeup alarm anomaly detector"
Daniel Nishi [Tue, 23 May 2017 17:51:17 +0000 (17:51 +0000)]
Merge "Fix storage summary background colors." into oc-dev am:
8b8f27cd06
am:
4525f9387a
Change-Id: I8a30afbf999318fd7dabaf7d15ce38f99168353b
Matthew Fritze [Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)]
Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
Matthew Fritze [Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)]
Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps
Merge for ag/
2247508
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
Daniel Nishi [Tue, 23 May 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Fix storage summary background colors." into oc-dev
am:
8b8f27cd06
Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev
Doris Ling [Mon, 22 May 2017 22:58:03 +0000 (15:58 -0700)]
Add summary text to Apps & notifications -> Notifications
Share the summary provider for Apps & notifications -> Notifications ->
Notifications with Apps & notifications -> Notifications so that the
upper level also shows the corresponding notification summary.
Change-Id: Id6879d9a6b00237781320c18591703b3031c9627
Fix:
36376411
Test: make RunSettingsRoboTests
jackqdyulei [Thu, 18 May 2017 00:00:47 +0000 (17:00 -0700)]
Add wakeup alarm anomaly detector
Wakeup alarm count frequent is calculated by a / b, where
1. a: the total wakeup alarm count since the last full charge
2. b: total time running since last full charge
(include sleeping time)
This cl also has the following changes:
1. Move bunch of methods to BatteryUtils
2. Create type WAKEUP_ALARM
3. Add and update tests
Upcoming cl will make sure we get the threshold from
AnomalyDetectionPolicy
Bug:
36921529
Test: RunSettingsRoboTests
Change-Id: I4f7b85606df68b6057f6c7d3f3be7f9a9a747f1d
jackqdyulei [Wed, 17 May 2017 22:05:02 +0000 (15:05 -0700)]
Hook up the anomaly policy to wakelockanomaly
Bug:
38233034
Test: RunSettingsRoboTests
Change-Id: Id8c13480e08f609a1ba9927ba35558f82664904c
Felipe Leme [Thu, 18 May 2017 21:32:13 +0000 (14:32 -0700)]
Refactored ConfirmationDialogFragment to use default construcutor.
Test: manual verification
Test: make RunSettingsRoboTests -j90
Fixes:
38397850
Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180
Geoffrey Pitsch [Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev am:
77bb0aaf96
am:
984dad4ac6
Change-Id: Ica82b112388bd3f3f0a1e2e0281b8c1036d64934
Geoffrey Pitsch [Tue, 23 May 2017 15:24:09 +0000 (15:24 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
am:
77bb0aaf96
Change-Id: I571de55e0b3d090ec2442e2019b2a460b0185283
TreeHugger Robot [Tue, 23 May 2017 15:18:06 +0000 (15:18 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
Tony Mak [Mon, 22 May 2017 13:22:57 +0000 (14:22 +0100)]
Show app battery usage in correct user
Test: m -j RunSettingsRoboTests
Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
Merged-In: I6c0f74b79468ee670f642edb0a50400c030d1925
Fix:
38447829
Tony Mak [Tue, 23 May 2017 09:29:06 +0000 (10:29 +0100)]
Show app battery usage in correct user
Test: m -j RunSettingsRoboTests
Fix:
38447829
Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
Lei Yu [Tue, 23 May 2017 06:23:31 +0000 (06:23 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev am:
37f6b7f751
am:
996adfeb29
Change-Id: I11d0c39a68428637ce12aaffaa2a4f1e49bb716e
Lei Yu [Tue, 23 May 2017 06:21:32 +0000 (06:21 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
am:
37f6b7f751
Change-Id: I5b5edc8b88a16c83a77ca584d21279892ebb08bf
Lei Yu [Tue, 23 May 2017 06:16:43 +0000 (06:16 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
Salvador Martinez [Tue, 23 May 2017 03:28:29 +0000 (03:28 +0000)]
Merge "Use enhanced estimate battery info when available"
TreeHugger Robot [Tue, 23 May 2017 03:01:28 +0000 (03:01 +0000)]
Merge "Log different type of values into different constants"
Lei Yu [Tue, 23 May 2017 02:07:17 +0000 (02:07 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev am:
161571617b
am:
603fba8afe -s ours
Change-Id: I371a760fe5e801bdbbc6c658c8611d922f41b32a
TreeHugger Robot [Tue, 23 May 2017 02:01:41 +0000 (02:01 +0000)]
Merge "Show shadow when entity header starts scrolling."
Lei Yu [Tue, 23 May 2017 01:56:48 +0000 (01:56 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
am:
161571617b
Change-Id: I7022cedf1252c5b8b02c6336611c9158ed98dc6c
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:36:19 +0000 (01:36 +0000)]
Merge changes Ief9e9690,I1cc1bc2d
* changes:
Split BluetoothSettings into two pages
Dupe BluetoothSettings and DeviceListPreferenceFragment
Salvador Martinez [Fri, 19 May 2017 18:12:26 +0000 (11:12 -0700)]
Use enhanced estimate battery info when available
This CL updates the battery page to get the updated strings and
other relevant battery info from directly from SettingsLib by
providing it an overrided drain time instead of manually changing
the value in the returned info. This will provide the added benefit
of using the new strings when appropriate that tell the user that
the estimate provided is based on their usage.
Test: robotests
Bug:
38399659
Change-Id: I0db572c2ea78910756314b6bf066d37e9f90a15c
Fan Zhang [Fri, 19 May 2017 00:49:25 +0000 (17:49 -0700)]
Log different type of values into different constants
Bug:
38258793
Test: make RunSettingsRoboTests
Change-Id: I3ed170613709be04ffb2c561e132094d64619dd4
jackqdyulei [Mon, 22 May 2017 21:23:37 +0000 (14:23 -0700)]
Use BatteryStatsLoader in InstalledAppDetails
InstalledAppDetails uses AsyncTask to update foreground mBatteryStatsHelper
in background thread, which is dangerous. This cl make
InstalledAppDetails use BatteryStatsLoader to update batteryStatsHelper
and only assign it once in UI thread.
Bug:
38497555
Test: RunSettingsRoboTests
Change-Id: I3078b60a2dae36995ae5f925b4d49e36e79bddfd
Fan Zhang [Mon, 22 May 2017 16:50:38 +0000 (09:50 -0700)]
Show shadow when entity header starts scrolling.
- Add a controller to manage add/remove onScrollChangedListener to
recyclerviews.
- When recyclerview on each screen is scrolled to top, set actionbar
elevation to 0, otherwise set it to non-zero.
- When screen is moved to background, detach the listener.
- Use the controller in entity header.
Change-Id: Iecf194d885098c98c392810f62893ae9189f3936
Fix:
37670670
Test: make RunSettingsRoboTests
jackqdyulei [Wed, 10 May 2017 21:57:16 +0000 (14:57 -0700)]
Split BluetoothSettings into two pages
This cl splits the BluetoothSettings into paired device page and
pairing page, including small changes about:
1. Refactor the pages so they could get as much as static preference
from xml file rather than dynamically add/remove them everytime.
2. Remove creating method in BluetoothDeviceNamePreferenceController
and add it in xml file
3. Create BluetoothPairingDetail page, basically move the logic from
BluetoothSettings.
4. Make pairing preference clickable and jump to BluetoothPairingDetail
5. Add and update bunch of tests
Bug:
35877041
Test: RunSettingsRoboTests
Change-Id: Ief9e9690c612f7b46c58e866e5cecc511af642c8
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."
This reverts commit
a3c528f64db7aa96c258bdc2f6dad0a8d6897461.
Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Merged-In: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Lei Yu [Mon, 22 May 2017 23:30:01 +0000 (23:30 +0000)]
Merge "Revert "Add animation for battery asyncLoader.""
TreeHugger Robot [Mon, 22 May 2017 23:13:13 +0000 (23:13 +0000)]
Merge "Remove lifecycle interfaces from settings."
Kevin Chyn [Mon, 22 May 2017 23:09:35 +0000 (23:09 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev am:
32ad1c0db4
am:
35fb3302d7
Change-Id: I94cfe913b3e66ce27a0ee7ea439d3ed6a77942f3
Kevin Chyn [Mon, 22 May 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
am:
32ad1c0db4
Change-Id: I3fecd41dac6e4fb3b576a18bf46f1d9a25c1b9ca
TreeHugger Robot [Mon, 22 May 2017 22:40:41 +0000 (22:40 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Use label instead of raw value for theme preference summary"
Fan Zhang [Mon, 22 May 2017 21:47:38 +0000 (14:47 -0700)]
Remove lifecycle interfaces from settings.
They are already moved to settingslib.
Test: builds
Change-Id: I581bdaff492bdb1e75c66fb69c803eb222f68b8b
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."
This reverts commit
a3c528f64db7aa96c258bdc2f6dad0a8d6897461.
Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Fan Zhang [Mon, 22 May 2017 20:30:11 +0000 (13:30 -0700)]
Use label instead of raw value for theme preference summary
Change-Id: I4dd1c156c8e68dd5567093c56d5e6846357fc2d6
Fix:
38470685
Test: make RunSettingsRoboTests
Kevin Chyn [Sat, 20 May 2017 01:01:18 +0000 (18:01 -0700)]
Queue events if enrollment sidecar listener is null
Fixes:
38102355
Test: manual
Change-Id: I98bd347ee98117f7489376abd94d276d20e7b762
TreeHugger Robot [Mon, 22 May 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 22 May 2017 16:11:11 +0000 (16:11 +0000)]
Merge "Show aditional WiFi calling message."
Meng Wang [Tue, 16 May 2017 18:50:20 +0000 (11:50 -0700)]
Show aditional WiFi calling message.
Bug:
37624313
Test: manual - locally apply this setting and verify that the
additional text is shown.
Change-Id: I8a15a9aeb71a0daab1ae4533f2c3b7d05c57bc5f
Geoffrey Pitsch [Thu, 11 May 2017 16:58:23 +0000 (12:58 -0400)]
Developer setting to enable notification channel warnings
Defaults to enabled for debuggable builds
Fixes:
37945054
Fixes:
38380608
Test: manual
Change-Id: I5d2101feffa7cf4433264eefc82b1b80f294d9f0
Hemant Gupta [Sat, 20 May 2017 01:39:52 +0000 (01:39 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev am:
860b608e41
am:
7eb5647656
Change-Id: I8d9c6e314a1b02cafc9523fae31a06dabfad4465
Hemant Gupta [Sat, 20 May 2017 01:37:14 +0000 (01:37 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
am:
860b608e41
Change-Id: If246a2f7d340b1d21c805322fa10f0c2fed8115c
TreeHugger Robot [Sat, 20 May 2017 01:33:36 +0000 (01:33 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
Kevin Chyn [Sat, 20 May 2017 00:01:59 +0000 (00:01 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev am:
5ccc2fe242
am:
2ca8635a5e
Change-Id: I167959f2ef69bcda7fb604e3f3e85512799ce691
Kevin Chyn [Sat, 20 May 2017 00:00:01 +0000 (00:00 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev
am:
5ccc2fe242
Change-Id: I08fb0fd4826135f4b469e6516d2cea25cba0a679
TreeHugger Robot [Fri, 19 May 2017 23:56:11 +0000 (23:56 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev
Hemant Gupta [Tue, 16 May 2017 09:57:33 +0000 (15:27 +0530)]
Settings: Convert notifications to use NotificationChannel (2/2)
Test Setup:
===========
HW DUT: Pixel O
Remote: MecApp (PBAP Client, MAP Client, SAP Client)
Steps:
=====
1. Enable BT on DUT and bond with Remote.
2. Connect from MecApp for PBAP, MAP, SAP and observe if
connection goes through fine.
Reproducibility:
===============
5/5
Observation:
============
MAP, PBAP and SAP cannot be connected.
Root cause:
In Android O, notifications are hidden by default.
This must be changed to use notification channels so that the
priority of the notifications can be updated.
Test: PBAP/MAP/SAP connection works fine with MecApp.
Bug:
38331825
Change-Id: I51de0ea303037bf88773352d99f092673acda2e3
(cherry picked from commit
bd9f532013f0397879101f68f21ac8841fec344b)
Kevin Chyn [Fri, 19 May 2017 19:22:44 +0000 (12:22 -0700)]
Fix settings crash due to enrolling error
Test: There's a condition where FP enrollment fails and a fragment
transaction/commit occurs after onSaveInstanceState. We should be
using commitAllowingStateLoss() instead of commit()
I'm not able to repro this issue but from looking at the stack
trace this should fix the problem.
Fixes:
38432354
Change-Id: I56b9c8d2efc45e9d77f29b897280f5378c3a84a0
Adam Bookatz [Fri, 19 May 2017 18:40:09 +0000 (18:40 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev am:
11e7781b32
am:
069e8ab3cd
Change-Id: Iebcee8a80d79311f5c967b9db47928653822861f