OSDN Git Service
Jaewoong Jung [Thu, 13 Oct 2016 18:08:22 +0000 (11:08 -0700)]
Changes event handling phases for DeviceListPreferenceFragment.
Bug:
31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
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)"
Bill Yi [Fri, 7 Oct 2016 15:06:16 +0000 (15:06 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours am:
e87f2bbaa0 -s ours am:
784b1cbf35 -s ours
am:
4b9f135da5 -s ours
Change-Id: If4bc2da9b0ec543fed1ec0f75362f311a6775623
Lei Yu [Fri, 7 Oct 2016 15:05:50 +0000 (15:05 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am:
9c54a67d66 am:
d7f2c10f94
am:
efaf3b502f
Change-Id: I79a7bd27ff6c6e7109b1f0a6cb03992b73135436
jackqdyulei [Fri, 7 Oct 2016 15:02:47 +0000 (15:02 +0000)]
Add "FILTER_NOT_HIDE" for all app filters. am:
d785a8db78 am:
00ed827516
am:
15c14f0cc2
Change-Id: I2322d0d3e496013cfb02444b2224fab1eecb47b9
TreeHugger Robot [Fri, 7 Oct 2016 02:54:29 +0000 (02:54 +0000)]
Merge "Remove old unused activity."
Bill Yi [Fri, 7 Oct 2016 01:28:19 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f91ca6bcd9 -s ours am:
f0be222981 -s ours
am:
4d6ff7e669 -s ours
Change-Id: Ifc72d70787d079c2e53d5ec7a39d4da4163b2a5d
Bill Yi [Fri, 7 Oct 2016 01:28:05 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE am:
8aee525418 -s ours am:
47f6271d15 -s ours
am:
b30d988a1c -s ours
Change-Id: I430a63f2b012f187ce9a0efe6b9f97182a5af8cb
Lorenzo Colitti [Fri, 7 Oct 2016 01:27:53 +0000 (01:27 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am:
365d95b69a am:
bb529c267d
am:
03cbc81f32
Change-Id: I7ae22e05a1f58b396f4543a68a73c8b209ec14b4
Lorenzo Colitti [Fri, 7 Oct 2016 01:27:38 +0000 (01:27 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev am:
b01c080b08 am:
be3924c1b6
am:
54ec71200b
Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df
Matthew Fritze [Fri, 7 Oct 2016 01:27:24 +0000 (01:27 +0000)]
Prevent monkey tests from crashing with race conditions am:
7ac78f2daf am:
9264154bee
am:
927007dd53
Change-Id: I74f45c284e8cde00af46562fb0903a856ea05de4
Bill Yi [Fri, 7 Oct 2016 01:27:08 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
0d424ef9bd -s ours am:
ffae7d82c3 -s ours
am:
c8ef13d120 -s ours
Change-Id: Ic0c4a0ba5246c2cff4db7064d1ca4ff5f3bbf89e
Bill Yi [Fri, 7 Oct 2016 01:26:52 +0000 (01:26 +0000)]
Import translations. DO NOT MERGE am:
ae33f8e62c -s ours am:
b1f3f659f1 -s ours
am:
5fb2b6c1c5 -s ours
Change-Id: I5260308dca7fe09bde379cf57f2378fef3693a71
Philip P. Moltmann [Fri, 7 Oct 2016 01:26:36 +0000 (01:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am:
f9ca06b367 am:
ae23c07073
am:
96d81b1332
Change-Id: I9469b566e8682162271992f3175c5153c4668614
Philip P. Moltmann [Fri, 7 Oct 2016 00:35:19 +0000 (00:35 +0000)]
USB restriction is similar to media restriction am:
13ee50be48 am:
a78fced068
am:
58154e8c27
Change-Id: Ic59c247b316a26640bda84b82c001254e01abe74
Fan Zhang [Thu, 6 Oct 2016 23:51:01 +0000 (16:51 -0700)]
Remove old unused activity.
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
Matthew Fritze [Thu, 6 Oct 2016 22:53:47 +0000 (22:53 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev am:
9f95a59b88
am:
d983045488
Change-Id: I67fd24b1e7647f0216983d5a16f868c16a90cadc
Matthew Fritze [Thu, 6 Oct 2016 22:53:33 +0000 (22:53 +0000)]
The center column of the support tab is back to white am:
2d07290453
am:
409714d0e4
Change-Id: I6af46ec8fdba17edbb2716704e903c7aedb7d456
Matthew Fritze [Thu, 6 Oct 2016 22:49:58 +0000 (22:49 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am:
9f95a59b88
Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705
Matthew Fritze [Thu, 6 Oct 2016 22:49:56 +0000 (22:49 +0000)]
The center column of the support tab is back to white
am:
2d07290453
Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e
Salvador Martinez [Thu, 6 Oct 2016 22:46:46 +0000 (22:46 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am:
8a468ccbdf
am:
17866f0b17
Change-Id: Icc7ae5e2d553a2ef9ad8d568b0e2d90a393256b1
Salvador Martinez [Thu, 6 Oct 2016 22:46:32 +0000 (22:46 +0000)]
Added onClick logic for domain url list screen am:
26e5760033
am:
1d383e1220
Change-Id: Ib1e58b680a866dea0b4ac398215d94f6c636f1cc
Matthew Fritze [Thu, 6 Oct 2016 22:43:28 +0000 (22:43 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
Salvador Martinez [Thu, 6 Oct 2016 22:42:57 +0000 (22:42 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
am:
8a468ccbdf
Change-Id: Iffe25be2bb7623d3529feb8d0bd115c7b423db72
Salvador Martinez [Thu, 6 Oct 2016 22:42:56 +0000 (22:42 +0000)]
Added onClick logic for domain url list screen
am:
26e5760033
Change-Id: I11428c85ef077b7eee6ec7b6722463e86ac21a9b
Salvador Martinez [Thu, 6 Oct 2016 22:37:05 +0000 (22:37 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
Stephen Chen [Thu, 6 Oct 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Fix icon loading in EditUserInfo dialog on orientation change."
TreeHugger Robot [Thu, 6 Oct 2016 22:12:30 +0000 (22:12 +0000)]
Merge "Use a Digit TtsSpan for pairing pins for talkback."
Bill Yi [Thu, 6 Oct 2016 21:55:00 +0000 (21:55 +0000)]
Import translations. DO NOT MERGE am:
a6b32526d7 -s ours
am:
f6a7a97ab5 -s ours
Change-Id: I51cf96a100e1a84bbc8fbd6dc5ce26b66056ec12
Fan Zhang [Thu, 6 Oct 2016 21:54:46 +0000 (21:54 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am:
6cea122bfc
am:
207bb2947e
Change-Id: Ied103f6707f804a8b386d0f0d3df1837c5b98571
Fan Zhang [Thu, 6 Oct 2016 21:54:30 +0000 (21:54 +0000)]
Fix a NPE in confirm lock screen. am:
8b2baed2be
am:
da856402f4
Change-Id: Ia13e941b8766ae128bf31f224656f7e862e0b059
Jeff Sharkey [Thu, 6 Oct 2016 21:54:16 +0000 (21:54 +0000)]
Switch to static warning threshold when adopting. am:
bd7adb9313
am:
da414d0afe
Change-Id: I111c8b3ea63deb6e9797a520f1431d73adc16c99
Jonathan Nieder [Thu, 6 Oct 2016 21:52:45 +0000 (21:52 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am:
6cab381bc2
am:
64136f30d1
Change-Id: I3ee238ba4cc3ec5abc1ecc950dc01e7b08a5d62a
Doris Ling [Thu, 6 Oct 2016 21:52:33 +0000 (21:52 +0000)]
Add condition check for double tap gesture settings. am:
c8b7555fc9
am:
7f62890cad
Change-Id: If89dfb781ca8b8e0a7dd8e0b1f59e32ae6d4d98f
Matthew Fritze [Thu, 6 Oct 2016 21:52:02 +0000 (21:52 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am:
fb42828381
am:
62fcf9369f
Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0
Matthew Fritze [Thu, 6 Oct 2016 21:51:47 +0000 (21:51 +0000)]
Fix bug preventing users from clicking settings suggestions twice am:
f265dbc447
am:
e5e60eccaf
Change-Id: I956ed80ce27ec50378901111f5679b163719628f
Jeff Sharkey [Thu, 6 Oct 2016 21:15:12 +0000 (21:15 +0000)]
Give CTS the handle it expects to remove PIN. am:
7be1b5923f
am:
4ae8eb2aae
Change-Id: Ic3ee8be685d83b8be07f2e0129e3a7573ad4e920
Bill Yi [Thu, 6 Oct 2016 21:10:21 +0000 (21:10 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours am:
e87f2bbaa0 -s ours
am:
784b1cbf35 -s ours
Change-Id: I9ffd9b5af5b44dd0e9dfb0a2ee231ce619ce9d71
Lei Yu [Thu, 6 Oct 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am:
9c54a67d66
am:
d7f2c10f94
Change-Id: Idd81a0beb1b5999696e6f47ab6fb64110a4f0793
jackqdyulei [Thu, 6 Oct 2016 21:00:31 +0000 (21:00 +0000)]
Add "FILTER_NOT_HIDE" for all app filters. am:
d785a8db78
am:
00ed827516
Change-Id: I108753ea9af54aba754a8899f02a3f100f3b38fd
Bill Yi [Thu, 6 Oct 2016 21:00:03 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f91ca6bcd9 -s ours
am:
f0be222981 -s ours
Change-Id: I22381a4a7bc572765718c6003769431b0974567c
Bill Yi [Thu, 6 Oct 2016 20:59:44 +0000 (20:59 +0000)]
Import translations. DO NOT MERGE am:
8aee525418 -s ours
am:
47f6271d15 -s ours
Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am:
365d95b69a
am:
bb529c267d
Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:17 +0000 (20:59 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev am:
b01c080b08
am:
be3924c1b6
Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89
Matthew Fritze [Thu, 6 Oct 2016 20:59:03 +0000 (20:59 +0000)]
Prevent monkey tests from crashing with race conditions am:
7ac78f2daf
am:
9264154bee
Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3
Bill Yi [Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
0d424ef9bd -s ours
am:
ffae7d82c3 -s ours
Change-Id: Iff1708277ff2827a631228d4c4a286e503543190
Bill Yi [Thu, 6 Oct 2016 20:58:37 +0000 (20:58 +0000)]
Import translations. DO NOT MERGE am:
ae33f8e62c -s ours
am:
b1f3f659f1 -s ours
Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1
Philip P. Moltmann [Thu, 6 Oct 2016 20:58:22 +0000 (20:58 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am:
f9ca06b367
am:
ae23c07073
Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda
Bill Yi [Thu, 6 Oct 2016 20:49:41 +0000 (20:49 +0000)]
Import translations. DO NOT MERGE
am:
a6b32526d7 -s ours
Change-Id: I3235d07dafe77d05dadeadc3224469bd225ae7f8
Fan Zhang [Thu, 6 Oct 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
am:
6cea122bfc
Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e
Fan Zhang [Thu, 6 Oct 2016 20:49:10 +0000 (20:49 +0000)]
Fix a NPE in confirm lock screen.
am:
8b2baed2be
Change-Id: I4c16a428b3409b33815740c734b3390192866a20
Jeff Sharkey [Thu, 6 Oct 2016 20:48:56 +0000 (20:48 +0000)]
Switch to static warning threshold when adopting.
am:
bd7adb9313
Change-Id: Ib7e82d50f7d3e98d3a669a9508d6cee9871a4383
Jonathan Nieder [Thu, 6 Oct 2016 20:48:23 +0000 (20:48 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
am:
6cab381bc2
Change-Id: I4e140a32c84c820761176e816cbb88c4be46ef70
Doris Ling [Thu, 6 Oct 2016 20:47:32 +0000 (20:47 +0000)]
Add condition check for double tap gesture settings.
am:
c8b7555fc9
Change-Id: I7fa9e76725a7920d36936ffd4a737e8ed7eb8107
Matthew Fritze [Thu, 6 Oct 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
am:
fb42828381
Change-Id: I77f828913d3a941f040c6548fc99e86033e432a6
Matthew Fritze [Thu, 6 Oct 2016 20:47:07 +0000 (20:47 +0000)]
Fix bug preventing users from clicking settings suggestions twice
am:
f265dbc447
Change-Id: I0e9a1a92d84f2ae2dc783ddea4f6bcb728a72a52