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
Marie Janssen
620fe71520
Merge "Bluetooth: Make notifications local-only"
...
am: 348a7085fa
2017-06-22 15:37:28 +00:00
Treehugger Robot
348a7085fa
Merge "Bluetooth: Make notifications local-only"
2017-06-22 15:31:39 +00:00
Juan Lang
27883720a9
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev am: d392a9bfbb
...
am: 5bc7075d48
2017-06-22 14:35:51 +00: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
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
TreeHugger Robot
ee947e9a31
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
2017-06-22 01:33:23 +00:00
Doris Ling
319516eb66
Merge "Add summary text for account sync." into oc-dr1-dev am: 053e3dcf9f
...
am: 0376b0b78b
2017-06-22 00:23:23 +00:00
Doris Ling
0376b0b78b
Merge "Add summary text for account sync." into oc-dr1-dev
...
am: 053e3dcf9f
2017-06-22 00:13:57 +00:00
TreeHugger Robot
053e3dcf9f
Merge "Add summary text for account sync." into oc-dr1-dev
2017-06-21 23:59:40 +00:00
TreeHugger Robot
9b00e0ca8d
Merge "Update entity header to match mock"
2017-06-21 23:52:39 +00: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
Fan Zhang
ab55528e5a
Update entity header to match mock
...
- Also add a small screen width version
Change-Id: I284561cd713d8382845db02c163983623cede038
Fix: 62709577
Test: existing tests still pass
2017-06-21 15:13: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
Bill Yi
0e8bd16ccf
Import translations. DO NOT MERGE am: ae5a31e55c -s ours am: f6e125b46d -s ours
...
am: 85a0fab72f
2017-06-21 20:38:41 +00:00
Bill Yi
0141622074
Import translations. DO NOT MERGE am: ae5a31e55c -s ours am: a3821d019a -s ours
...
am: 7b13f1c0fb
2017-06-21 20:37:54 +00:00
Bill Yi
85a0fab72f
Import translations. DO NOT MERGE am: ae5a31e55c -s ours
...
am: f6e125b46d
2017-06-21 20:29:57 +00:00
Bill Yi
7b13f1c0fb
Import translations. DO NOT MERGE am: ae5a31e55c -s ours
...
am: a3821d019a
2017-06-21 20:26:57 +00:00
Bill Yi
f6e125b46d
Import translations. DO NOT MERGE
...
am: ae5a31e55c
2017-06-21 20:23:16 +00:00
jackqdyulei
c0181d66af
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev am: 88163b7215
...
am: 7027c83112
2017-06-21 20:21:54 +00:00
Bill Yi
a3821d019a
Import translations. DO NOT MERGE
...
am: ae5a31e55c
2017-06-21 20:21:34 +00:00
jackqdyulei
7027c83112
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
...
am: 88163b7215
2017-06-21 20:12:53 +00:00
Doris Ling
c5c2f10fc5
Add summary text for account sync.
...
Bug: 62862167
Test: builds
Change-Id: I7e3c7e76791d9f79430b2b549d4d89a18a4e2bba
2017-06-21 13:12:41 -07:00
TreeHugger Robot
88163b7215
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
2017-06-21 19:55:51 +00:00
TreeHugger Robot
8b8316ffa7
Merge "Import translations. DO NOT MERGE"
2017-06-21 19:49:34 +00:00
Bill Yi
2d99d07fc7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ce043d0f98 -s ours
...
am: 6e3b702c5a
2017-06-21 19:47:27 +00:00
Bill Yi
6e3b702c5a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: ce043d0f98
2017-06-21 19:44:58 +00:00
TreeHugger Robot
ce043d0f98
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-21 19:42:37 +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
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
