OSDN Git Service
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."
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."
TreeHugger Robot [Thu, 13 Oct 2016 02:17:35 +0000 (02:17 +0000)]
Merge "Add connected devices dashboard category for new IA."
Qi Ding [Thu, 13 Oct 2016 01:40:53 +0000 (01:40 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6 am:
1d07de566d am:
85768b3723
am:
051c1b298d
Change-Id: Ib75d421f6b4a4ee97006a3427bb4b1111c5ece2f
Qi Ding [Thu, 13 Oct 2016 01:34:08 +0000 (01:34 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6 am:
1d07de566d
am:
85768b3723
Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863
Qi Ding [Thu, 13 Oct 2016 01:28:00 +0000 (01:28 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6
am:
1d07de566d
Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06
Qi Ding [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix searched item isn't highlighted"
am:
363c529dc6
Change-Id: I57e09b8403422338c80bd369d41822bf26383361
Treehugger Robot [Thu, 13 Oct 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Fix searched item isn't highlighted"
Fan Zhang [Wed, 12 Oct 2016 23:23:48 +0000 (16:23 -0700)]
Add backup & reset to System page.
Bug:
31801428
Test: manual
Change-Id: I8a169790f3ac86db84f99a3128a49ac0b62d8af4
Doris Ling [Mon, 10 Oct 2016 23:59:16 +0000 (16:59 -0700)]
Add connected devices dashboard category for new IA.
Add the initial version for the connected devices category.
Test: RunSettingsRoboTests
Bug:
31800290
Change-Id: Ibacef7d5ceaae5e71ff5e5b1c35dafa7738e4f75
Fan Zhang [Wed, 12 Oct 2016 19:35:52 +0000 (12:35 -0700)]
Add PreferenceControllers to Network page.
- Also made tiles refresh more efficient: when category changes, only
refresh dynamic tiles. Static tiles from xml will not change due to
category change.
Bug:
31799836
Test: RunSettingsRoboTests
Change-Id: I1e4c85f2c122c65ec99729e43a66c80acdd863c8
Fan Zhang [Wed, 12 Oct 2016 19:34:45 +0000 (19:34 +0000)]
Merge "Add a new empty dashboard for Network & Internet."
Daniel Sandler [Wed, 12 Oct 2016 19:21:45 +0000 (19:21 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am:
0f6ae3aa87 am:
93622202d3
am:
95e41c7bc3
Change-Id: I87332ef6242b2067306bb0937d030a49d0e27427
Dan Sandler [Wed, 12 Oct 2016 19:21:29 +0000 (19:21 +0000)]
Suppress notif block/silence settings for essential packages. am:
acf763e996 am:
80df316ac4
am:
67d326d2b4 -s ours
Change-Id: Iff62df5631e5f1be1bbdcabed45353f04eba2be4
Fan Zhang [Tue, 11 Oct 2016 23:27:45 +0000 (16:27 -0700)]
Add a new empty dashboard for Network & Internet.
Bug:
31799836
Test: RunSettingsRoboTests
Change-Id: Ide0c07839332e615f6ba86fb87a1eb04cce2fae7
Salvador Martinez [Wed, 12 Oct 2016 17:22:47 +0000 (17:22 +0000)]
Merge "Memory Usage by apps no longer shows empty icon"
Daniel Sandler [Wed, 12 Oct 2016 13:58:04 +0000 (13:58 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am:
0f6ae3aa87
am:
93622202d3
Change-Id: I8fa5d3437be488fa3c5f1d57a2032636d4fcd6b1
Dan Sandler [Wed, 12 Oct 2016 13:57:49 +0000 (13:57 +0000)]
Suppress notif block/silence settings for essential packages. am:
acf763e996
am:
80df316ac4
Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92
Daniel Sandler [Wed, 12 Oct 2016 13:51:05 +0000 (13:51 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
am:
0f6ae3aa87
Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076
Dan Sandler [Wed, 12 Oct 2016 13:51:04 +0000 (13:51 +0000)]
Suppress notif block/silence settings for essential packages.
am:
acf763e996
Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
Daniel Sandler [Wed, 12 Oct 2016 13:38:56 +0000 (13:38 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
Julia Reynolds [Wed, 12 Oct 2016 12:46:13 +0000 (12:46 +0000)]
Merge "Fix settings crash when disabling listener."
Doris Ling [Wed, 12 Oct 2016 00:47:45 +0000 (00:47 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am:
49c0bab8bf am:
739a261295
am:
dc9ea4ceff
Change-Id: I7ed21ffde9518b3bf87df2ad33f653a35e02c6f8
Doris Ling [Wed, 12 Oct 2016 00:47:37 +0000 (00:47 +0000)]
Remove pickup gesture settings if sensor is not found. am:
94e0da52fc am:
79aa718669
am:
ef980e4dd1
Change-Id: I6d5ee494b26838f0c508f297a28a18ccc1867422
Doris Ling [Wed, 12 Oct 2016 00:36:05 +0000 (00:36 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am:
49c0bab8bf
am:
739a261295
Change-Id: I25ceb867e68720f22405a944669c5fc9ca3570f4
Doris Ling [Wed, 12 Oct 2016 00:35:58 +0000 (00:35 +0000)]
Remove pickup gesture settings if sensor is not found. am:
94e0da52fc
am:
79aa718669
Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0
Doris Ling [Wed, 12 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am:
49c0bab8bf
Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99
Doris Ling [Wed, 12 Oct 2016 00:23:46 +0000 (00:23 +0000)]
Remove pickup gesture settings if sensor is not found.
am:
94e0da52fc
Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
Salvador Martinez [Tue, 11 Oct 2016 23:37:50 +0000 (16:37 -0700)]
Memory Usage by apps no longer shows empty icon
ProcessStatsPreference will now fallback to a
default icon instead of an empty icon. Logging
was added to be able to identify what causes
list to add entries with no text.
Test: Manual, requires installing -> uninstalling an app
Bug:
31812426
Change-Id: Ia1b147ba7a552ec4880776ebf8dba6745154117a
Doris Ling [Tue, 11 Oct 2016 23:42:41 +0000 (23:42 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
TreeHugger Robot [Tue, 11 Oct 2016 23:39:02 +0000 (23:39 +0000)]
Merge "Reorder prefs in display settings for new info architecture"
Fan Zhang [Tue, 11 Oct 2016 21:23:13 +0000 (14:23 -0700)]
Reorder prefs in display settings for new info architecture
Bug:
31800242
Test: Visual inspection
Change-Id: I0cd0e7464eb05881a9b27e726caa1b1e0d211fb6
Doris Ling [Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)]
Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.
Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.
Bug:
32072298
Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
Julia Reynolds [Wed, 21 Sep 2016 13:36:02 +0000 (09:36 -0400)]
Fix settings crash when disabling listener.
Bug:
32092445
Test: manual
Change-Id: Iaa26e755381ba202cccf6d518dacb86eae4c6d10
Jeff Sharkey [Tue, 11 Oct 2016 20:25:22 +0000 (14:25 -0600)]
Offer a null FignerprintManager.
Settings likes null.
Test: builds
Bug:
32060380
Change-Id: I5ba19bccfd48916d4e581518928a6aee19e84a77
Nick Kralevich [Tue, 11 Oct 2016 18:34:33 +0000 (18:34 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am:
09d3961326 am:
2c89007df6
am:
ff4ba8ae6f
Change-Id: I7e0e158814f028702b04b8d5f4fdf9647c4383fc
Nick Kralevich [Tue, 11 Oct 2016 18:28:05 +0000 (18:28 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am:
09d3961326
am:
2c89007df6
Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc
Nick Kralevich [Tue, 11 Oct 2016 18:20:41 +0000 (18:20 +0000)]
Delete "Show CPU usage" am:
73dfef91b2 am:
0f3067ce58
am:
a5a5ebfe5d
Change-Id: I0bde9410a458f90b0f6c2e1e037999399cf7afe0
Nick Kralevich [Tue, 11 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Delete "Show CPU usage" am:
73dfef91b2
am:
0f3067ce58
Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715
Nick Kralevich [Tue, 11 Oct 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am:
09d3961326
Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819
Nick Kralevich [Tue, 11 Oct 2016 18:09:16 +0000 (18:09 +0000)]
Delete "Show CPU usage"
am:
73dfef91b2
Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848
Nick Kralevich [Tue, 11 Oct 2016 18:03:25 +0000 (18:03 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 16:03:29 +0000 (09:03 -0700)]
Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.
Bug:
21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
TreeHugger Robot [Tue, 11 Oct 2016 15:30:17 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 11 Oct 2016 15:21:54 +0000 (15:21 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours am:
9f8644c04f -s ours am:
d13a041835 -s ours
am:
d754fdb4eb -s ours
Change-Id: I2cfac47c84086cdb39748f9d495946b795059251
Bill Yi [Tue, 11 Oct 2016 15:21:39 +0000 (15:21 +0000)]
Import translations. DO NOT MERGE am:
6acf691f62 -s ours am:
557f83edb5 -s ours
am:
2e8fd872d2 -s ours
Change-Id: I4c0d3662ad4597aa68016d1d526c7794f4ae833a
Bill Yi [Tue, 11 Oct 2016 15:14:56 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours am:
9f8644c04f -s ours
am:
d13a041835 -s ours
Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779
Bill Yi [Tue, 11 Oct 2016 15:14:42 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am:
6acf691f62 -s ours
am:
557f83edb5 -s ours
Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1
Bill Yi [Tue, 11 Oct 2016 15:09:26 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours
am:
9f8644c04f -s ours
Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478
Bill Yi [Tue, 11 Oct 2016 15:09:11 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE
am:
6acf691f62 -s ours
Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3
Bill Yi [Tue, 11 Oct 2016 15:03:11 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE
am:
64d3e22e11 -s ours
Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948
Fan Zhang [Thu, 6 Oct 2016 23:33:13 +0000 (16:33 -0700)]
Add display settings dashboard to new IA.
- Added a activity-alias pointing to displaySettings as top level
setting item.
- Refactored all preference logic in DisplaySettings into
PreferenceControllers. During fragment onAttach it installs all
controllers, and during onResume it updates preference state. Each
controller listens to its own preference change event.
Bug:
31800242
Test: RunSettingsRoboTests
Change-Id: Ibc9bf200c5acce7c4ae9292340822afee27a3a28
TreeHugger Robot [Mon, 10 Oct 2016 22:03:36 +0000 (22:03 +0000)]
Merge "Refactor SummaryLoader to set summary on subsetting pages."
Bill Yi [Mon, 10 Oct 2016 19:39:26 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import
Bill Yi [Mon, 10 Oct 2016 19:31:59 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import
Bill Yi [Mon, 10 Oct 2016 19:17:24 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id7b4a0335fdc650c0799b540b4fcf6b29f00850c
Auto-generated-cl: translation import
Fan Zhang [Fri, 7 Oct 2016 19:41:43 +0000 (12:41 -0700)]
Refactor SummaryLoader to set summary on subsetting pages.
- Make a SummaryConsumer interface. Things that needs latest summary
should implement this interface (DashboardAdapter for homepage,
DashboardFragment for subsettings). This also decouples SummaryLoader
from relying on SettingsDrawerActivity.
- Make DashboardFeatureProvider more generic to load DashboardCategory
by key.
Bug:
31781480
Test: RunSettingsRoboTests
Change-Id: I9c65456fb433a74c352498251e0ccf65da0be1f0
Salvador Martinez [Fri, 7 Oct 2016 21:27:27 +0000 (21:27 +0000)]
Fixed spans getting stripped from disclaimer am:
e0b74a6de0 am:
e3c31f3aec
am:
05a98e79f5
Change-Id: I279044936bb9214b84409d5674f2ba7dbb136f9a
Salvador Martinez [Fri, 7 Oct 2016 21:08:47 +0000 (21:08 +0000)]
Fixed spans getting stripped from disclaimer am:
e0b74a6de0
am:
e3c31f3aec
Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64
Salvador Martinez [Fri, 7 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Fixed spans getting stripped from disclaimer
am:
e0b74a6de0
Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940
TreeHugger Robot [Fri, 7 Oct 2016 20:55:27 +0000 (20:55 +0000)]
Merge "Fixed spans getting stripped from disclaimer"
TreeHugger Robot [Fri, 7 Oct 2016 20:37:47 +0000 (20:37 +0000)]
Merge "Refactor DashboardFragment."
Salvador Martinez [Fri, 7 Oct 2016 02:26:51 +0000 (19:26 -0700)]
Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.
Test: Instrumentation Test
Bug:
31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
Salvador Martinez [Fri, 7 Oct 2016 02:26:51 +0000 (19:26 -0700)]
Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.
Test: Instrumentation Test
Bug:
31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
Fan Zhang [Fri, 7 Oct 2016 15:38:48 +0000 (08:38 -0700)]
Refactor DashboardFragment.
Merged refreshAllPreferences into DashboardFragment. This hopefully
makes it more modular to manage preference display logic in each
dashboardFragment, and makes it more efficient to monitor category
changes.
Now subclasses needs to implement 2 methods:
- displayResourceTiles(): for 'static' preferences from xml
- getDashboardTiles(): returns a list of dashboard tiles and superclass
will wire it up to preference screen.
If getDashboardTiles() return null (aka no dashboardCategory available),
the fragment will not attempt to monitor category change. The edge case
is that if a package starts to provide a tile for this category, we will
not be notified. I have not seen this case coming up. If we indeed need
to handle this case, the category listener needs to have a way to
monitor specific category rather than globally.
Bug:
31781480
Test: make RunSettingsRoboTests -j40
Change-Id: Ia9f9541b95816214df0d0bb27e3e41078c36c5ca
Matthew Fritze [Fri, 7 Oct 2016 18:26:11 +0000 (18:26 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev am:
9f95a59b88 am:
d983045488
am:
d4abdb67d3
Change-Id: I5b3c5c9f0bd542f00af359dbf1ea2c8158ace8f8
Matthew Fritze [Fri, 7 Oct 2016 18:25:54 +0000 (18:25 +0000)]
The center column of the support tab is back to white am:
2d07290453 am:
409714d0e4
am:
a70964091a
Change-Id: Ic9ae4d2fd08f9a840d3a2431d6ab4292258df873
Salvador Martinez [Fri, 7 Oct 2016 18:25:34 +0000 (18:25 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am:
8a468ccbdf am:
17866f0b17
am:
0967f79ce0
Change-Id: I555f0b2911e995e417af078d275b062fae1f6efa
Salvador Martinez [Fri, 7 Oct 2016 18:25:15 +0000 (18:25 +0000)]
Added onClick logic for domain url list screen am:
26e5760033 am:
1d383e1220
am:
6a832d4db6
Change-Id: I15c67361c870f846641dbc1b96d1f8701af54301
Bill Yi [Fri, 7 Oct 2016 18:24:58 +0000 (18:24 +0000)]
Import translations. DO NOT MERGE am:
a6b32526d7 -s ours am:
f6a7a97ab5 -s ours
am:
1e7f5e9dd7 -s ours
Change-Id: I9461da3a3a36f7e9845251cc3c44908281a8edbb
Fan Zhang [Fri, 7 Oct 2016 18:24:41 +0000 (18:24 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am:
6cea122bfc am:
207bb2947e
am:
6b72c17434
Change-Id: I8ab6ad5ace2b737bfb9e68cc350aa45dbc836d01
Fan Zhang [Fri, 7 Oct 2016 18:24:24 +0000 (18:24 +0000)]
Fix a NPE in confirm lock screen. am:
8b2baed2be am:
da856402f4
am:
ac053b6179
Change-Id: I40cca984f15ff6a3ffb193d53e47d46ddc393274
Jeff Sharkey [Fri, 7 Oct 2016 18:24:07 +0000 (18:24 +0000)]
Switch to static warning threshold when adopting. am:
bd7adb9313 am:
da414d0afe
am:
049d2b88f6
Change-Id: Ie30f3242174699a2e8ad08c311e9993da4187e6f
Jonathan Nieder [Fri, 7 Oct 2016 18:15:48 +0000 (18:15 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am:
6cab381bc2 am:
64136f30d1
am:
27615e6b49
Change-Id: Ic3cd78dadd1eb0687b6080d59f2c05dd83662e6e
Doris Ling [Fri, 7 Oct 2016 18:15:40 +0000 (18:15 +0000)]
Add condition check for double tap gesture settings. am:
c8b7555fc9 am:
7f62890cad
am:
a5eb66eb01
Change-Id: I0d56e0b1e3b25bd589fcfd4ba2301d51369f217e
Matthew Fritze [Fri, 7 Oct 2016 18:15:09 +0000 (18:15 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am:
fb42828381 am:
62fcf9369f
am:
dabb84876b
Change-Id: I01551ebecdee7b029d62bd76b833d062ccfdfb40
Matthew Fritze [Fri, 7 Oct 2016 18:14:51 +0000 (18:14 +0000)]
Fix bug preventing users from clicking settings suggestions twice am:
f265dbc447 am:
e5e60eccaf
am:
5b509e12ff
Change-Id: Iab38544e2e6fa2cb500fbbdc997dacd9dc611198
Jeff Sharkey [Fri, 7 Oct 2016 18:00:48 +0000 (18:00 +0000)]
Give CTS the handle it expects to remove PIN. am:
7be1b5923f am:
4ae8eb2aae
am:
2eda02e617
Change-Id: If61a3086f49151db5c46fbc19dbe70b816de2e13
Lei Yu [Fri, 7 Oct 2016 17:34:19 +0000 (17:34 +0000)]
Merge "Adjustments based on the changes in ZoneGetter(settingslib)"
OSDN Git Service
