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
jackqdyulei
caa80a8f41
Increase char limit for "Disconnect"
...
Bug: 62374362
Test: Build
Change-Id: I3cd8c2d48c5a686c006ab76686a2f017ac9c0ddf
2017-06-21 11:02:20 -07: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
Sean Stout
763acf0981
Add Night Light to Settings widget
...
Night Light now appears as an option when placing the Settings widget
Bug: 62823114
Test: manual - Place Settings widget on launcher
Change-Id: I521980ec63b2e9034f44d2de7796dcb64f870b06
2017-06-21 16:24:34 +00:00
TreeHugger Robot
d92d83e496
Merge "Change fingerprint noti settings for consistency with language_and_input.xml"
2017-06-21 13:13:16 +00:00
Bill Yi
ae5a31e55c
Import translations. DO NOT MERGE
...
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
2017-06-20 21:36:56 -07:00
Bill Yi
44fd91be3b
Import translations. DO NOT MERGE
...
Change-Id: I82b2878398a5fffe928a175a72d80a75bfff8f56
Auto-generated-cl: translation import
2017-06-20 21:20:19 -07:00
Bill Yi
60fd22dee1
Import translations. DO NOT MERGE
...
Change-Id: I316b6070d49d6a4e684f3a680bbc90fb4217e551
Auto-generated-cl: translation import
2017-06-20 20:54:49 -07: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
Salvador Martinez
cbefbc261f
Add info string to advanced battery usage page
...
This CL adds an FYI string under the battery graph to let users
know that their current estimate is coming from the enhanced
estimate provider when it is enabled.
Test: Robotests
Bug: 38399654
Change-Id: If5cd622ef0251a5a483cef870fc2261369e14845
2017-06-20 18:37:49 -07: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
3e3dc6cf07
Merge "Update footer string in battery settings" into oc-dr1-dev am: eca713c1c2
...
am: 17b88aca70
2017-06-21 01:10:08 +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
17b88aca70
Merge "Update footer string in battery settings" into oc-dr1-dev
...
am: eca713c1c2
2017-06-21 01:03:15 +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
eca713c1c2
Merge "Update footer string in battery settings" into oc-dr1-dev
2017-06-21 00:52:07 +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
563f121380
Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918 am: 7de9af3b8f
...
am: b7c8809d3b
2017-06-20 23:30: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
b7c8809d3b
Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
...
am: 7de9af3b8f
2017-06-20 23:11:47 +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
7de9af3b8f
Merge "Hide wifi and bt in battery settings" into oc-dev
...
am: 05777a7918
2017-06-20 23:03:00 +00:00
jackqdyulei
23f388076d
Make icon in Anomaly detail page have badge.
...
Anomaly detail page is using the correct API but wrong parameters.
This cl fix it by specifying the correct userId.
Bug: 38306392
Test: RunSettingsRoboTests
Change-Id: If593bf8a7881a9eecbaa62858492878235d88397
2017-06-20 16:01:17 -07:00
jackqdyulei
9d0d6e4fcc
Merge "Hide wifi and bt in battery settings" into oc-dev
...
am: 05777a7918
2017-06-20 22:55:47 +00:00
