OSDN Git Service
Philip P. Moltmann [Fri, 21 Oct 2016 00:22:28 +0000 (17:22 -0700)]
Add preupload to Settings.
Test: Uploaded
Change-Id: I454df2797ac7314060646c66c6caf2538d36b1d0
Anna Galusza [Thu, 20 Oct 2016 03:57:15 +0000 (03:57 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am:
ee502d5037 am:
b104675957
am:
d3bb66c47a
Change-Id: I4f998f93f2fca553656f1738f95d62ec28275b6c
Anna Galusza [Thu, 20 Oct 2016 03:57:00 +0000 (03:57 +0000)]
Fix insufficint contrast on Vision Settings toggles. am:
e212817785 am:
5bf1f668ff
am:
0f2799799c
Change-Id: Idd8af227e76f36e6ca7fe148abba5ce065c21c38
Anna Galusza [Thu, 20 Oct 2016 03:46:56 +0000 (03:46 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am:
ee502d5037
am:
b104675957
Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9
Anna Galusza [Thu, 20 Oct 2016 03:46:42 +0000 (03:46 +0000)]
Fix insufficint contrast on Vision Settings toggles. am:
e212817785
am:
5bf1f668ff
Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am:
ee502d5037
Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Fix insufficint contrast on Vision Settings toggles.
am:
e212817785
Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
Anna Galusza [Thu, 20 Oct 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Mon, 17 Oct 2016 19:23:08 +0000 (12:23 -0700)]
Fix insufficint contrast on Vision Settings toggles.
Bug:
29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
Jaewoong Jung [Wed, 19 Oct 2016 21:21:59 +0000 (21:21 +0000)]
Merge "Fixes how we read the current WiFi network IP address."
Fan Zhang [Wed, 19 Oct 2016 19:00:32 +0000 (12:00 -0700)]
Move add/remove/findPref to ProgressiveDisclosureMixin.
This makes ProgressiveDisclosureMixin the authority for adding/removing
preferences so caller doesn't need to figure out if a preference is on
screen or collapsed.
Bug:
32255863
Test: make RunSettingsRoboTests -j40
Change-Id: I9bd69661b78efd4bb4913665f6ea09f6bdc231f5
Jaewoong Jung [Thu, 13 Oct 2016 21:21:52 +0000 (14:21 -0700)]
Fixes how we read the current WiFi network IP address.
The old logic could read the current IP address only when the network has the
Internet access.
Bug:
31934577
Test: Manual inspection
Test: make RunSettingsRoboTests -j40
Change-Id: I46fe6f6fb4322e8245d3ac66ac6530228c226d16
TreeHugger Robot [Wed, 19 Oct 2016 16:14:01 +0000 (16:14 +0000)]
Merge "Add progressive disclsoure"
Salvador Martinez [Wed, 19 Oct 2016 03:36:09 +0000 (03:36 +0000)]
Merge "Updating colors as part of bluetooth refactoring"
Salvador Martinez [Wed, 19 Oct 2016 03:36:09 +0000 (03:36 +0000)]
Merge "Refactoring for bluetooth dialogs"
Fan Zhang [Tue, 18 Oct 2016 19:58:31 +0000 (12:58 -0700)]
Add progressive disclsoure
- Add a ProgressiveDisclosureMixin that contains all logic for collapse
preference list when it's too long
- Refactored PreferenceController's updateState to take a preference
instead of PreferenceScreen, because with progressive disclosure the
preference can either be in screen or the mixin. DashboardFragment is
responsible finding the preference before passing it to controller.
Bug:
32255863
Test: RunSettingsRoboTests
Change-Id: I6713abd61c954ce12732902e5b3ca4d4c0b1563e
TreeHugger Robot [Tue, 18 Oct 2016 23:56:56 +0000 (23:56 +0000)]
Merge "Add Sound to top level settings."
Adrian Roos [Tue, 18 Oct 2016 22:50:13 +0000 (22:50 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
ee5eef1492 am:
f33b98b750
am:
3ba7aab582
Change-Id: If3a88583281aca94caaa7614460b9249a2689fc5
Adrian Roos [Tue, 18 Oct 2016 22:43:36 +0000 (22:43 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
ee5eef1492
am:
f33b98b750
Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd
Adrian Roos [Tue, 18 Oct 2016 22:27:31 +0000 (22:27 +0000)]
Separate ambient display triggers am:
82829ee0b1 am:
5ba2074e31
am:
c0dfa153f4
Change-Id: I2eed4a8bfbc8ded0f5d12b3284d8ae5a0cfb1823
Adrian Roos [Tue, 18 Oct 2016 22:19:52 +0000 (22:19 +0000)]
Separate ambient display triggers am:
82829ee0b1
am:
5ba2074e31
Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c
Adrian Roos [Tue, 18 Oct 2016 22:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
Adrian Roos [Tue, 18 Oct 2016 22:07:11 +0000 (22:07 +0000)]
Separate ambient display triggers
am:
82829ee0b1
Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
Doris Ling [Tue, 18 Oct 2016 20:08:29 +0000 (13:08 -0700)]
Add Sound to top level settings.
Fix:
31801516
Test: manual
Change-Id: I8325d21c8de9648c8de7b1489012d11c51aba7c1
Lei Yu [Tue, 18 Oct 2016 20:14:20 +0000 (20:14 +0000)]
Merge "Layout change in support card and support dialog"
TreeHugger Robot [Tue, 18 Oct 2016 18:34:59 +0000 (18:34 +0000)]
Merge "Put divider back when IA is turned off."
Salvador Martinez [Tue, 4 Oct 2016 00:52:51 +0000 (17:52 -0700)]
Refactoring for bluetooth dialogs
Dialogs displayed when attempting to connect
to a bluetooth device have been refactored so
that they use a proper dialog fragment. Hardware
dependencies have also been refactored into a
controller class to make it possible to test
these dialogs as well as the controller
independently of one another.
Test: RoboTests
Bug:
32180625
Change-Id: I5447f8299bc13e139052635fc63546cbfc997f33
Lei Yu [Tue, 18 Oct 2016 17:13:48 +0000 (17:13 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am:
7fee46383f am:
b4969f5b6f
am:
f8866e2bfa
Change-Id: I8c6707dceea3a8b695f9259764eaff9a7d2a3938
jackqdyulei [Tue, 18 Oct 2016 17:13:34 +0000 (17:13 +0000)]
Suspend action in security patch when browser is disabled am:
013da34209 am:
221b9157b4
am:
ac49ccedb7
Change-Id: Ib4458b25bb12a928a9a258b2430877ca75a18f78
Lei Yu [Tue, 18 Oct 2016 17:09:29 +0000 (17:09 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am:
7fee46383f
am:
b4969f5b6f
Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7
jackqdyulei [Tue, 18 Oct 2016 17:09:15 +0000 (17:09 +0000)]
Suspend action in security patch when browser is disabled am:
013da34209
am:
221b9157b4
Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4
Lei Yu [Tue, 18 Oct 2016 16:54:04 +0000 (16:54 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am:
7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
jackqdyulei [Tue, 18 Oct 2016 16:54:03 +0000 (16:54 +0000)]
Suspend action in security patch when browser is disabled
am:
013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
Fan Zhang [Tue, 18 Oct 2016 16:52:07 +0000 (09:52 -0700)]
Put divider back when IA is turned off.
Bug:
32231177
Test: manual
Change-Id: I657e0bb3b8721c494cd1a6272b370b54ae5063ec
Lei Yu [Tue, 18 Oct 2016 16:45:35 +0000 (16:45 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 06:03:22 +0000 (06:03 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours am:
37c5dd0fe3 -s ours am:
a95e430c93 -s ours
am:
79a4b3160d -s ours
Change-Id: Ia66d62f6c0f049546124c1d23157a2c95b6f73f1
Bill Yi [Tue, 18 Oct 2016 06:03:06 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
5ffabbe58b -s ours am:
987866df87 -s ours
am:
cda385e996 -s ours
Change-Id: I319f972f8593cf853ffe3feef4669d2765e3298a
Bill Yi [Tue, 18 Oct 2016 06:02:50 +0000 (06:02 +0000)]
Import translations. DO NOT MERGE am:
ccde0787b8 -s ours am:
4367ed325e -s ours
am:
3e664455dc -s ours
Change-Id: I63ac14a3d355f0519b69b68c1f723aaa4a4da22b
Bill Yi [Tue, 18 Oct 2016 05:49:41 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours am:
37c5dd0fe3 -s ours
am:
a95e430c93 -s ours
Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23
Bill Yi [Tue, 18 Oct 2016 05:49:22 +0000 (05:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
5ffabbe58b -s ours
am:
987866df87 -s ours
Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf
Bill Yi [Tue, 18 Oct 2016 05:49:02 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am:
ccde0787b8 -s ours
am:
4367ed325e -s ours
Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8
Bill Yi [Tue, 18 Oct 2016 05:40:29 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours
am:
37c5dd0fe3 -s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
Bill Yi [Tue, 18 Oct 2016 05:40:02 +0000 (05:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
5ffabbe58b -s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
Bill Yi [Tue, 18 Oct 2016 05:40:01 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE
am:
ccde0787b8 -s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
Bill Yi [Tue, 18 Oct 2016 05:37:33 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am:
6515783df6 -s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894
TreeHugger Robot [Tue, 18 Oct 2016 05:30:53 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:30:33 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 18 Oct 2016 00:47:27 +0000 (00:47 +0000)]
Merge "Add move settings to system page."
Salvador Martinez [Fri, 14 Oct 2016 22:42:08 +0000 (15:42 -0700)]
Updating colors as part of bluetooth refactoring
Dialogs for bluetooth pairing are being refactored.
This contains some trivial color changes that were
done at the same time.
Test: RoboTests
Bug:
32180625
Change-Id: I8807ab929faa95158ec6d7d336b2580a42bccf20
Fan Zhang [Mon, 17 Oct 2016 22:57:57 +0000 (15:57 -0700)]
Add move settings to system page.
Bug:
31801428
Test: manual
Change-Id: Ifc1f1190369a2f199e58700583bb3dfa251a1b4d
Fan Zhang [Mon, 17 Oct 2016 22:42:44 +0000 (22:42 +0000)]
Merge "Draw preference divider based on preference group."
jackqdyulei [Tue, 11 Oct 2016 16:59:33 +0000 (09:59 -0700)]
Layout change in support card and support dialog
1. Wrap the support_disclaimer_content by scrollview.
2. Change the layout in support_escalation_options using layout_weight.
3. Add styles in layout-sw300dp and layout-sw400dp
The target scope is between 300dp->400dp, so I add the default style
in sw400dp and changed style in sw300dp to cover it.
Bug:
31399419
Test: Visual
Change-Id: I117acb0c5b992bea2cded6cd48749c4ed7b04488
jackqdyulei [Fri, 14 Oct 2016 20:53:14 +0000 (13:53 -0700)]
Suspend action in security patch when browser is disabled
When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.
Bug:
32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.
Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10
Adrian Roos [Fri, 14 Oct 2016 20:03:55 +0000 (13:03 -0700)]
Separate ambient display triggers
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.
Bug:
32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
Doris Ling [Mon, 17 Oct 2016 20:31:57 +0000 (20:31 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am:
ec5314f2f5 am:
1a674eef53
am:
b4a122b227
Change-Id: Idefb4b0e28a11eb62811b329be062ce813bb2eb5
Doris Ling [Mon, 17 Oct 2016 20:31:49 +0000 (20:31 +0000)]
Add static preview images to gesture settings. am:
12e4bebabf am:
df7b815980
am:
fccee6adae
Change-Id: Ia745f80fa47a7316cb462918f900de001b1ecf03
Bill Yi [Mon, 17 Oct 2016 20:26:38 +0000 (13:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4de644f9065e553dfd28458421aaba309a41de5
Auto-generated-cl: translation import
Doris Ling [Mon, 17 Oct 2016 20:24:34 +0000 (20:24 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am:
ec5314f2f5
am:
1a674eef53
Change-Id: I5fe058f76e3a7061fc78fe02294f0cd802534cde
Doris Ling [Mon, 17 Oct 2016 20:24:26 +0000 (20:24 +0000)]
Add static preview images to gesture settings. am:
12e4bebabf
am:
df7b815980
Change-Id: I56c1f9368bb762e400e0a071e72dd175351a7696
Bill Yi [Mon, 17 Oct 2016 20:21:09 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85609bede92b4ae044f1f98a101576447f93367f
Auto-generated-cl: translation import
Doris Ling [Mon, 17 Oct 2016 20:18:33 +0000 (20:18 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
am:
ec5314f2f5
Change-Id: Ib195aa98f9838ceffc27255e34b18e2bdfbccbff
Doris Ling [Mon, 17 Oct 2016 20:18:30 +0000 (20:18 +0000)]
Add static preview images to gesture settings.
am:
12e4bebabf
Change-Id: I4f5f16b109c4997b15b93320945bbb3ccab06735
Doris Ling [Mon, 17 Oct 2016 20:11:31 +0000 (20:11 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
Bill Yi [Mon, 17 Oct 2016 20:10:39 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibfa2cefd09d0e3d59ce49b2e35bb5555caea32c0
Auto-generated-cl: translation import
Sanket Padawe [Mon, 17 Oct 2016 18:39:03 +0000 (11:39 -0700)]
Fix build failure.
+ Merge commit '
a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98
Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145
Sanket Padawe [Mon, 17 Oct 2016 17:25:04 +0000 (17:25 +0000)]
Fix multi-sim popup issue in data usage. am:
8591f26fa3
am:
d8fc77122b
Change-Id: Idbe5e19e8ce5660e4a056b28917fccca5477cc9e
Sanket Padawe [Mon, 17 Oct 2016 17:18:34 +0000 (17:18 +0000)]
Fix multi-sim popup issue in data usage.
am:
8591f26fa3
Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8
Fan Zhang [Mon, 17 Oct 2016 17:16:04 +0000 (10:16 -0700)]
Draw preference divider based on preference group.
Bug:
32179750
Test: RunSettingsRoboTests
Change-Id: I3ea1cd662c5baec825fae615883b94b26e648409
TreeHugger Robot [Sat, 15 Oct 2016 00:27:56 +0000 (00:27 +0000)]
Merge "Fix a bug in navup button."
Fan Zhang [Fri, 14 Oct 2016 22:37:19 +0000 (15:37 -0700)]
Fix a bug in navup button.
When launching internal setting activity from dynamic tiles and hit back
button, it goes back to settings homepage. Instead it should just go
back to the UI where startActivity is called.
This is caused by various activity flags set in manifest. Instead of
using startActivity, internal settings screen will just be launched
using SubSetting, which doesn't have this problem.
For external settings, still use startActivityForResult to maintain
backstack.
Test: manual
Change-Id: I07aa6ed932b9048375629d6ffd6ad1adfaba3fd3
Sanket Padawe [Fri, 14 Oct 2016 22:41:52 +0000 (15:41 -0700)]
Fix multi-sim popup issue in data usage.
+ Avoid sending popup dialog when data is enabled on currently active
data sim.
Bug:
31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
Fan Zhang [Fri, 14 Oct 2016 21:02:03 +0000 (14:02 -0700)]
Add security to top level settings.
Bug:
31801373
Test: manual
Change-Id: I7bac30c07f2d811fa465f92f836c2c672a39d2e3
TreeHugger Robot [Fri, 14 Oct 2016 19:56:34 +0000 (19:56 +0000)]
Merge "Add summary provider for system tile."
Jerry Zhang [Fri, 14 Oct 2016 18:24:32 +0000 (18:24 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
Fan Zhang [Fri, 14 Oct 2016 17:23:38 +0000 (10:23 -0700)]
Add summary provider for system tile.
Refactored getLocaleNames() into a FeatureProvider interface so it's
reusable and testable.
Bug:
31801428
Test: RunSettingsRoboTests
Change-Id: I2d31a66a4b32cfa7a364a4cfef1f6eea87084577
TreeHugger Robot [Fri, 14 Oct 2016 12:46:15 +0000 (12:46 +0000)]
Merge "Show a disclaimer about enabling vpn lockdown"
Bill Yi [Fri, 14 Oct 2016 09:32:55 +0000 (09:32 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours am:
1146d6375c -s ours am:
11d7cba3b2 -s ours
am:
680138830a -s ours
Change-Id: I6cba636d681e19b4970da1a920ab3f76c0f01fc9
Bill Yi [Fri, 14 Oct 2016 09:32:38 +0000 (09:32 +0000)]
Import translations. DO NOT MERGE am:
18a64f201b -s ours am:
fceb2818d6 -s ours
am:
77f8f43e79 -s ours
Change-Id: I27b86acb12e3cf53a5444b3c024626f6da90a67a
Bill Yi [Fri, 14 Oct 2016 09:29:39 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours am:
1146d6375c -s ours
am:
11d7cba3b2 -s ours
Change-Id: I4a666011cda0542627d55677ed4bbe26378e2804
Bill Yi [Fri, 14 Oct 2016 09:29:25 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am:
18a64f201b -s ours
am:
fceb2818d6 -s ours
Change-Id: I5bc44f819b0dcc27aa5dcd411bed23eda90ec733
Bill Yi [Fri, 14 Oct 2016 09:22:56 +0000 (09:22 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours
am:
1146d6375c -s ours
Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704
Bill Yi [Fri, 14 Oct 2016 09:21:26 +0000 (09:21 +0000)]
Import translations. DO NOT MERGE
am:
43920d3ba5 -s ours
Change-Id: I72f1d361a29a4391c33c5fd0fb8a3340287314f9
Bill Yi [Fri, 14 Oct 2016 09:20:40 +0000 (09:20 +0000)]
Import translations. DO NOT MERGE
am:
18a64f201b -s ours
Change-Id: I91b138778b8488b63afa11c1c6625f7a72acbd62
TreeHugger Robot [Fri, 14 Oct 2016 09:11:30 +0000 (09:11 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 14 Oct 2016 02:24:22 +0000 (02:24 +0000)]
Merge "Show back button for non-toplevel settings in new IA."
TreeHugger Robot [Fri, 14 Oct 2016 02:04:08 +0000 (02:04 +0000)]
Merge "Add nfc preference controller."
TreeHugger Robot [Fri, 14 Oct 2016 00:51:31 +0000 (00:51 +0000)]
Merge "Use a ConcurrentSet to keep track of preferences in logger."
Jerry Zhang [Wed, 12 Oct 2016 21:42:56 +0000 (14:42 -0700)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
This allows us to get rid of an extraneous config switch and
simplify some code.
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
Doris Ling [Fri, 14 Oct 2016 00:16:07 +0000 (17:16 -0700)]
Add nfc preference controller.
Update connected devices and wireless setting to use the nfc
preference controller for displaying the nfc and bean settings.
Test: RunSettingsRoboTests
Bug:
31800290
Change-Id: I06eee6b7bfe1d8b767216198bd37f1c79e53d992
TreeHugger Robot [Fri, 14 Oct 2016 00:00:01 +0000 (00:00 +0000)]
Merge "Add more preference controllers to network page."
Fan Zhang [Thu, 13 Oct 2016 23:53:41 +0000 (16:53 -0700)]
Show back button for non-toplevel settings in new IA.
Bug:
32159368
Test: RunSettingsRoboTests
Change-Id: I627a6e456ece8ecb1fc337fcd4dd1e9598dab554
Bill Yi [Thu, 13 Oct 2016 22:35:00 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
Bill Yi [Thu, 13 Oct 2016 22:30:06 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
Fan Zhang [Thu, 13 Oct 2016 22:07:43 +0000 (15:07 -0700)]
Use a ConcurrentSet to keep track of preferences in logger.
The preference set can be modified across different threads, apparently.
Change-Id: I4506066d86f7f7d5570c24511db20471d12b0b4a
Fixes:
32156066
Test: manual
Bill Yi [Thu, 13 Oct 2016 22:22:07 +0000 (15:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia650e465c441fbb127038ad378fe01d8ef86583c
Auto-generated-cl: translation import
Fan Zhang [Thu, 13 Oct 2016 16:53:38 +0000 (09:53 -0700)]
Add more preference controllers to network page.
- To support Mobile plan preference controller, extended
LifecycleObserver pattern to also observe onCreate and onSaveInstance.
Bug:
31799836
Test: RunSettingsRoboTests
Change-Id: Ie98db7efa91f0a8b4c8a06a784d3351237e59fe0
TreeHugger Robot [Thu, 13 Oct 2016 20:44:24 +0000 (20:44 +0000)]
Merge "Check for FingerprintManager before using."
Jeff Sharkey [Thu, 13 Oct 2016 18:59:17 +0000 (12:59 -0600)]
Check for FingerprintManager before using.
Test: built
Bug:
32096112
Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb
TreeHugger Robot [Thu, 13 Oct 2016 04:00:45 +0000 (04:00 +0000)]
Merge "Add PreferenceControllers to Network page."