OSDN Git Service
Paul Stewart [Fri, 28 Oct 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
am:
917b7b863c
Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
Treehugger Robot [Fri, 28 Oct 2016 20:56:35 +0000 (20:56 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
Marie Janssen [Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
am:
de037d5491 -s ours
Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
Paul Stewart [Thu, 27 Oct 2016 20:29:05 +0000 (13:29 -0700)]
Don't display an invalid Wi-Fi MAC address
Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable". The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid. This change uses
this test and avoids having the confusing default address displayed.
Bug:
32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"
Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:
28715749
Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit
b06766f129dac138568883110f6d2a085b53445b)
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
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
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"
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
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
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
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
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: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
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
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
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
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
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
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
Jeff Sharkey [Thu, 6 Oct 2016 20:41:48 +0000 (20:41 +0000)]
Give CTS the handle it expects to remove PIN.
am:
7be1b5923f
Change-Id: If949083726e0809d6ed45083282acda2255f546b
Bill Yi [Thu, 6 Oct 2016 20:41:23 +0000 (20:41 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours
am:
e87f2bbaa0 -s ours
Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e
Lei Yu [Thu, 6 Oct 2016 20:41:04 +0000 (20:41 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
am:
9c54a67d66
Change-Id: Iba9f294bbbd1fd32e55950a6ddcc73604e4d0bea
jackqdyulei [Thu, 6 Oct 2016 20:28:52 +0000 (20:28 +0000)]
Add "FILTER_NOT_HIDE" for all app filters.
am:
d785a8db78
Change-Id: I779bc9de3e094c80c1749ac65acb932dc251f451
Bill Yi [Thu, 6 Oct 2016 20:28:13 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f91ca6bcd9 -s ours
Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10
Bill Yi [Thu, 6 Oct 2016 20:28:12 +0000 (20:28 +0000)]
Import translations. DO NOT MERGE
am:
8aee525418 -s ours
Change-Id: If58e31763e5f3b014126005d2816532323aa13f3
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:51 +0000 (20:27 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am:
365d95b69a
Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev
am:
b01c080b08
Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
Matthew Fritze [Thu, 6 Oct 2016 20:27:36 +0000 (20:27 +0000)]
Prevent monkey tests from crashing with race conditions
am:
7ac78f2daf
Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
Bill Yi [Thu, 6 Oct 2016 20:27:09 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
0d424ef9bd -s ours
Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9
Bill Yi [Thu, 6 Oct 2016 20:27:08 +0000 (20:27 +0000)]
Import translations. DO NOT MERGE
am:
ae33f8e62c -s ours
Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122
Philip P. Moltmann [Thu, 6 Oct 2016 20:26:50 +0000 (20:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am:
f9ca06b367
Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
Philip P. Moltmann [Thu, 6 Oct 2016 20:07:13 +0000 (20:07 +0000)]
USB restriction is similar to media restriction am:
13ee50be48
am:
a78fced068
Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:42 +0000 (19:55 +0000)]
USB restriction is similar to media restriction
am:
13ee50be48
Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
Qi Ding [Sun, 18 Sep 2016 09:03:47 +0000 (17:03 +0800)]
Fix searched item isn't highlighted
The searched item isn't highlighted.
To fix this issue, the highlight process should be posted
as Runnable object.
Bug:
31983855
Test: manual - search a item in Settings app
Change-Id: I0dcc5bb52b2faa0a23991459885d8dfcaed0f226
Bill Yi [Thu, 6 Oct 2016 00:36:53 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id06ae993d6e5f0bb1249f5b94e96c73d1c1a183d
Auto-generated-cl: translation import
Salvador Martinez [Wed, 5 Oct 2016 21:46:34 +0000 (14:46 -0700)]
Added onClick logic for domain url list screen
This class was created from a code refactoring
in ManageApplications but the functionality
associated with clicking on a preference was
accidently left out. This CL restores that
functionality.
Test: run ManageDomainUrlsEspressoTest class
Bug:
31958776
Change-Id: I1a7f5ee92daeebdb9fd7d9c83a564f0d104aa562
Matthew Fritze [Wed, 5 Oct 2016 18:07:08 +0000 (11:07 -0700)]
The center column of the support tab is back to white
Regression came in here:
ag/
1492761
Change-Id: I7ea5015abbe78d06b6df17d3caa3177642539023
Fixes:
31958339
Test: Manual
OSDN Git Service
