OSDN Git Service
Doris Ling [Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev am:
d7fc071f48
am:
dc361053a0
Change-Id: Ibd4dbb2d883a16d3d0811b15dbda9825178d5833
Doris Ling [Thu, 22 Jun 2017 19:57:20 +0000 (19:57 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev
am:
d7fc071f48
Change-Id: I076f239380ffd7883e1907d1f409d47127483cdc
TreeHugger Robot [Thu, 22 Jun 2017 19:49:34 +0000 (19:49 +0000)]
Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"
TreeHugger Robot [Thu, 22 Jun 2017 19:39:08 +0000 (19:39 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 19:23:44 +0000 (19:23 +0000)]
Merge "Catch invalid extra when launching help trampoline."
TreeHugger Robot [Thu, 22 Jun 2017 19:23:20 +0000 (19:23 +0000)]
Merge "Move Apps & notifications -> App permissions into Advanced."
Salvador Martinez [Thu, 22 Jun 2017 18:50:40 +0000 (18:50 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev am:
ed66c5fcdf
am:
23888a246b
Change-Id: I7f82ff69a26028721b6d510b1350191654c84c05
Salvador Martinez [Thu, 22 Jun 2017 18:47:11 +0000 (18:47 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
am:
ed66c5fcdf
Change-Id: I54f1e94106a2ac984a7f736706e4c70b5db9b584
TreeHugger Robot [Thu, 22 Jun 2017 18:42:14 +0000 (18:42 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
Fan Zhang [Thu, 22 Jun 2017 16:40:42 +0000 (09:40 -0700)]
Catch invalid extra when launching help trampoline.
Change-Id: Ifb4b6fefe507cf403065436fca7a46d3a00afda7
Fix:
62821816
Test: robotests
Salvador Martinez [Mon, 19 Jun 2017 23:04:17 +0000 (16:04 -0700)]
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
TreeHugger Robot [Thu, 22 Jun 2017 16:29:18 +0000 (16:29 +0000)]
Merge "Notification settings to match ixd mocks: - added default sound config to general notification settings page - reordered items to match docs"
Marie Janssen [Thu, 22 Jun 2017 15:48:58 +0000 (15:48 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa am:
620fe71520 am:
3cc4522cbc
am:
852c930bfd
Change-Id: I410601bd3df4d4cfc2a1d212d972904610a8ea19
Marie Janssen [Thu, 22 Jun 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa am:
620fe71520
am:
3cc4522cbc
Change-Id: I74688eb24e40c7c1a370a9b36dec09b876047011
Marie Janssen [Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa
am:
620fe71520
Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
Marie Janssen [Thu, 22 Jun 2017 15:37:28 +0000 (15:37 +0000)]
Merge "Bluetooth: Make notifications local-only"
am:
348a7085fa
Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df
Treehugger Robot [Thu, 22 Jun 2017 15:31:37 +0000 (15:31 +0000)]
Merge "Bluetooth: Make notifications local-only"
Alison Cichowlas [Wed, 21 Jun 2017 15:41:34 +0000 (11:41 -0400)]
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
Juan Lang [Thu, 22 Jun 2017 14:35:51 +0000 (14:35 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev am:
d392a9bfbb
am:
5bc7075d48 -s ours
Change-Id: I69d48c1c8b70d93edd0d965e01dd4086abf59af9
Juan Lang [Thu, 22 Jun 2017 14:17:37 +0000 (14:17 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
am:
d392a9bfbb
Change-Id: I5696ba7e3fceb0ef81ea8609b573581b047bb3b7
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
Roozbeh Pournader [Tue, 20 Jun 2017 23:46:49 +0000 (16:46 -0700)]
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
Doris Ling [Thu, 22 Jun 2017 01:43:56 +0000 (01:43 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev am:
ee947e9a31
am:
11a93be4a7
Change-Id: Ib7b082644764d0dd43d29417f5076e99b37e856f
Doris Ling [Thu, 22 Jun 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
am:
ee947e9a31
Change-Id: Iee52408640206b365546614e5e8e6642a0a0d96d
TreeHugger Robot [Thu, 22 Jun 2017 01:33:22 +0000 (01:33 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
Doris Ling [Thu, 22 Jun 2017 00:23:23 +0000 (00:23 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev am:
053e3dcf9f
am:
0376b0b78b
Change-Id: If72db334afd790080bb86038c3e20aca70838605
Doris Ling [Thu, 22 Jun 2017 00:13:57 +0000 (00:13 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev
am:
053e3dcf9f
Change-Id: I833262facb7c027e26fd0507f9bd4f471a11e280
TreeHugger Robot [Wed, 21 Jun 2017 23:59:38 +0000 (23:59 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 23:52:38 +0000 (23:52 +0000)]
Merge "Update entity header to match mock"
Doris Ling [Wed, 21 Jun 2017 18:40:37 +0000 (11:40 -0700)]
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
Fan Zhang [Wed, 21 Jun 2017 21:49:31 +0000 (14:49 -0700)]
Update entity header to match mock
- Also add a small screen width version
Change-Id: I284561cd713d8382845db02c163983623cede038
Fix:
62709577
Test: existing tests still pass
Juan Lang [Thu, 11 May 2017 00:26:02 +0000 (17:26 -0700)]
Use SettingsLib's versions of Custom* classes.
Bug:
30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
Juan Lang [Wed, 21 Jun 2017 21:25:18 +0000 (21:25 +0000)]
Merge "Use SettingsLib's versions of Custom* classes."
TreeHugger Robot [Wed, 21 Jun 2017 21:05:40 +0000 (21:05 +0000)]
Merge "Tell SIMs apart in Data usage settings in multi-SIM case"
Bill Yi [Wed, 21 Jun 2017 20:38:41 +0000 (20:38 +0000)]
Import translations. DO NOT MERGE am:
ae5a31e55c -s ours am:
f6e125b46d -s ours
am:
85a0fab72f -s ours
Change-Id: I94b211bc1aeec9f3e12c9e718ad02bec29ad8678
Bill Yi [Wed, 21 Jun 2017 20:37:54 +0000 (20:37 +0000)]
Import translations. DO NOT MERGE am:
ae5a31e55c -s ours am:
a3821d019a -s ours
am:
7b13f1c0fb -s ours
Change-Id: I724ddd065756f785fc6ea560bc10606ee0fe78cf
Bill Yi [Wed, 21 Jun 2017 20:29:57 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE am:
ae5a31e55c -s ours
am:
f6e125b46d -s ours
Change-Id: I4329c03e80a2f9234e8b23a926ecb39e1a3c56bf
Bill Yi [Wed, 21 Jun 2017 20:26:57 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE am:
ae5a31e55c -s ours
am:
a3821d019a -s ours
Change-Id: I2fdc4eb1a34ad7a16a3325cbee96d61434da5f6f
Bill Yi [Wed, 21 Jun 2017 20:23:16 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
ae5a31e55c -s ours
Change-Id: Ibd2297385f91e2bf12e90f4933c785104aa6e153
jackqdyulei [Wed, 21 Jun 2017 20:21:54 +0000 (20:21 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev am:
88163b7215
am:
7027c83112
Change-Id: I5c17a83e483007473ceef77d766f7c728a592a2d
Bill Yi [Wed, 21 Jun 2017 20:21:34 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am:
ae5a31e55c -s ours
Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
jackqdyulei [Wed, 21 Jun 2017 20:12:53 +0000 (20:12 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
am:
88163b7215
Change-Id: I79b61d5b028dbcf22d8369cef7b92463fd90b498
Doris Ling [Wed, 21 Jun 2017 20:12:41 +0000 (13:12 -0700)]
Add summary text for account sync.
Bug:
62862167
Test: builds
Change-Id: I7e3c7e76791d9f79430b2b549d4d89a18a4e2bba
TreeHugger Robot [Wed, 21 Jun 2017 19:55:50 +0000 (19:55 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 19:49:33 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 21 Jun 2017 19:47:27 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
ce043d0f98 -s ours
am:
6e3b702c5a -s ours
Change-Id: I9d17eb83d26c6e58d9c0287179dcc2874126dd0e
Bill Yi [Wed, 21 Jun 2017 19:44:58 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ce043d0f98 -s ours
Change-Id: Ic700813442af82b979b645e465b2d5ac28ac4a74
TreeHugger Robot [Wed, 21 Jun 2017 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yoshinori Hirano [Mon, 27 Feb 2017 03:51:10 +0000 (11:51 +0800)]
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
Juan Lang [Thu, 11 May 2017 00:26:02 +0000 (17:26 -0700)]
Use SettingsLib's versions of Custom* classes.
Test: make RunSettingsRoboTests
Change-Id: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Daniel Nishi [Wed, 21 Jun 2017 18:28:53 +0000 (18:28 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev am:
648e31c283
am:
7ffa9b3a7b
Change-Id: If196b0729631c0817113e53b5126fc30b75c2833
Daniel Nishi [Wed, 21 Jun 2017 18:26:22 +0000 (18:26 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev
am:
648e31c283
Change-Id: If1c7ba281f0a959a9efc1e8c04b1cad8260b7020
Daniel Nishi [Wed, 21 Jun 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 18:03:51 +0000 (18:03 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev am:
2e34b94817
am:
5445997519
Change-Id: I92f71bde2b2143263aa1cd5bc7118eaf53df5e92
Matthew Fritze [Wed, 21 Jun 2017 18:03:00 +0000 (18:03 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev am:
bea9a5d739
am:
eeec8eecc0
Change-Id: I8094a44c26f0c9d457c1df7d67b6ee0e0fa672ab
jackqdyulei [Wed, 21 Jun 2017 17:28:35 +0000 (10:28 -0700)]
Increase char limit for "Disconnect"
Bug:
62374362
Test: Build
Change-Id: I3cd8c2d48c5a686c006ab76686a2f017ac9c0ddf
Lei Yu [Wed, 21 Jun 2017 17:49:50 +0000 (17:49 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
am:
2e34b94817
Change-Id: I986039cb676054b31b41ce54ab3c9c034297721f
Lei Yu [Wed, 21 Jun 2017 17:44:42 +0000 (17:44 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
Matthew Fritze [Wed, 21 Jun 2017 17:42:48 +0000 (17:42 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev
am:
bea9a5d739
Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214
TreeHugger Robot [Wed, 21 Jun 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev
Salvador Martinez [Wed, 21 Jun 2017 17:11:47 +0000 (17:11 +0000)]
Merge "Add info string to advanced battery usage page" into oc-dr1-dev am:
94d0a9c554
am:
776fe841f9
Change-Id: I9f3005e2ad9dbfde4c703c509e798e5292b8a1cb
Salvador Martinez [Wed, 21 Jun 2017 17:06:35 +0000 (17:06 +0000)]
Merge "Add info string to advanced battery usage page" into oc-dr1-dev
am:
94d0a9c554
Change-Id: If9b2ac97f41d55cf93dc33bbf129d56dfd9de225
Salvador Martinez [Wed, 21 Jun 2017 17:02:31 +0000 (17:02 +0000)]
Merge "Add info string to advanced battery usage page" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Wed, 21 Jun 2017 16:46:44 +0000 (16:46 +0000)]
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev am:
f5b77d65b4
am:
c14e0660a7
Change-Id: Ia9d5cf1fc594d9db756c1325cbb4a71a901a3934
Ajay Kumar Nadathur Sreenivasan [Wed, 21 Jun 2017 16:44:14 +0000 (16:44 +0000)]
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev
am:
f5b77d65b4
Change-Id: Ife35a27b745d0ea08b2580c3e41c6fdc38f3d1c4
Ajay Kumar Nadathur Sreenivasan [Wed, 21 Jun 2017 16:39:49 +0000 (16:39 +0000)]
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 13:13:14 +0000 (13:13 +0000)]
Merge "Change fingerprint noti settings for consistency with language_and_input.xml"
Bill Yi [Wed, 21 Jun 2017 04:36:56 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
Bill Yi [Wed, 21 Jun 2017 04:20:19 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82b2878398a5fffe928a175a72d80a75bfff8f56
Auto-generated-cl: translation import
Bill Yi [Wed, 21 Jun 2017 03:54:49 +0000 (20:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I316b6070d49d6a4e684f3a680bbc90fb4217e551
Auto-generated-cl: translation import
jackqdyulei [Wed, 21 Jun 2017 03:35:36 +0000 (03:35 +0000)]
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev am:
b010eed05d
am:
f60c265a11
Change-Id: I9048dcfe7494ee581f52955f893b9bf17f6ef3ee
Doris Ling [Wed, 21 Jun 2017 03:35:04 +0000 (03:35 +0000)]
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev am:
153e2b89b9
am:
33b2f7f466
Change-Id: I601744831f54fc2bd86a6f2c692e38ba361b3603
Kevin Chyn [Wed, 21 Jun 2017 03:29:23 +0000 (03:29 +0000)]
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev am:
58f668ef6b
am:
8dbfc66a74
Change-Id: Id8c0f3ee9de9796a6ce4e595714270a61e91d086
jackqdyulei [Wed, 21 Jun 2017 03:25:43 +0000 (03:25 +0000)]
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
am:
b010eed05d
Change-Id: I10ef631d4a870ce52c4730645e2f0da10cdfd8a1
Doris Ling [Wed, 21 Jun 2017 03:23:34 +0000 (03:23 +0000)]
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
am:
153e2b89b9
Change-Id: I3eaa11054beabf83765bf548a5dca6337817a546
TreeHugger Robot [Wed, 21 Jun 2017 03:16:31 +0000 (03:16 +0000)]
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 03:14:27 +0000 (03:14 +0000)]
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
Kevin Chyn [Wed, 21 Jun 2017 03:02:36 +0000 (03:02 +0000)]
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
am:
58f668ef6b
Change-Id: Ie1f930d8ebf08b6b3c92da4925144c1b3a70b50e
TreeHugger Robot [Wed, 21 Jun 2017 02:52:00 +0000 (02:52 +0000)]
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
Salvador Martinez [Mon, 19 Jun 2017 17:33:41 +0000 (10:33 -0700)]
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
Lei Yu [Wed, 21 Jun 2017 01:10:28 +0000 (01:10 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev am:
50062193c4
am:
216710961b
Change-Id: Idb6368febae133d373f76cc44eae73776358511b
Lei Yu [Wed, 21 Jun 2017 01:10:08 +0000 (01:10 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev am:
eca713c1c2
am:
17b88aca70
Change-Id: Ic4e3802cce4147cf189ce86ecc46d12866467fd8
Lei Yu [Wed, 21 Jun 2017 01:09:45 +0000 (01:09 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev am:
65afc6f86b
am:
76b09dfae5
Change-Id: I640153489cb5aa42f589a4320b4de6d557ddf986
Lei Yu [Wed, 21 Jun 2017 01:06:55 +0000 (01:06 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev
am:
50062193c4
Change-Id: I5de568b3397dc18ee800aa866b883fe33dcb3d95
Lei Yu [Wed, 21 Jun 2017 01:03:41 +0000 (01:03 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 01:03:15 +0000 (01:03 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev
am:
eca713c1c2
Change-Id: Iaaa78a3742a91f7d2d4e0a2edd361589fb340a39
Lei Yu [Wed, 21 Jun 2017 01:02:56 +0000 (01:02 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
am:
65afc6f86b
Change-Id: Ie4169d421e4c31e0e4eb780a9b1c8b3921db3fd4
Lei Yu [Wed, 21 Jun 2017 00:52:06 +0000 (00:52 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 00:51:30 +0000 (00:51 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
Kevin Chyn [Tue, 20 Jun 2017 23:47:27 +0000 (23:47 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev am:
b4bbc52e27
am:
57d52c6b50
Change-Id: Iec562ad11b1ca6488dff21bac38c4983b2db1ca4
Fan Zhang [Tue, 20 Jun 2017 23:44:21 +0000 (23:44 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev am:
58d27eef9a
am:
1d3f5e55cd
Change-Id: I1f0bd8ed2dcedb9add6c63d1ab72ce30fb93ca70
Kevin Chyn [Tue, 20 Jun 2017 23:38:12 +0000 (23:38 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
am:
b4bbc52e27
Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b
TreeHugger Robot [Tue, 20 Jun 2017 23:36:25 +0000 (23:36 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
Fan Zhang [Tue, 20 Jun 2017 23:34:24 +0000 (23:34 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
am:
58d27eef9a
Change-Id: I352415bd83dccd9f86cf9017816d5858b0afbedb
jackqdyulei [Tue, 20 Jun 2017 23:30:24 +0000 (23:30 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918 am:
7de9af3b8f
am:
b7c8809d3b
Change-Id: I1d55f21e8eb11aea2d88128179381e5055d8577a
jackqdyulei [Tue, 20 Jun 2017 23:29:53 +0000 (23:29 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918 am:
9d0d6e4fcc
am:
4b5a6a5284
Change-Id: Ieff7f23d06a16ff225cea8bebc31c6b2e0d8ee97
jackqdyulei [Tue, 20 Jun 2017 23:29:33 +0000 (23:29 +0000)]
Merge "Refine Anomaly detail page" into oc-dr1-dev am:
aad82fa4ee
am:
4d75698dac
Change-Id: I8c54da995f49826a982937f1c464a6e142ec43c2
TreeHugger Robot [Tue, 20 Jun 2017 23:23:38 +0000 (23:23 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
jackqdyulei [Tue, 20 Jun 2017 23:11:47 +0000 (23:11 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918
am:
7de9af3b8f
Change-Id: I7230df797ff3cc6435d9145527bc962a0df9deb3
jackqdyulei [Tue, 20 Jun 2017 23:05:34 +0000 (23:05 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918
am:
9d0d6e4fcc
Change-Id: If6960f114f3d42e95061a8e832f9b99695c2bd7f
OSDN Git Service
