OSDN Git Service
Justin Klaassen [Fri, 22 Jul 2016 22:15:48 +0000 (22:15 +0000)]
Merge \\"Add NightDisplaySettingsActivity\\" into nyc-mr1-dev am:
53e9f35239
am:
f4f56407c3
Change-Id: I56c76b69d457714fac17b7f8d28f5d1437cce698
Justin Klaassen [Fri, 22 Jul 2016 22:15:47 +0000 (22:15 +0000)]
Add NightDisplaySettingsActivity am:
eae3d9f932
am:
478dec45ce
Change-Id: Iea276484fd48b3a71fda30eae1cf153c3999a85a
Justin Klaassen [Fri, 22 Jul 2016 22:07:46 +0000 (22:07 +0000)]
Merge \"Add NightDisplaySettingsActivity\" into nyc-mr1-dev
am:
53e9f35239
Change-Id: If6f1f681fa5e1fb8fd1319054fce76fd8472f1c5
Justin Klaassen [Fri, 22 Jul 2016 22:07:06 +0000 (22:07 +0000)]
Add NightDisplaySettingsActivity
am:
eae3d9f932
Change-Id: Ia7cbd7dd7d65d5d04beba607a1ada82aed81d31a
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev
Anna Galusza [Fri, 22 Jul 2016 21:16:25 +0000 (21:16 +0000)]
Merge \\"Fix font and display size settings pages for small screens.\\" into nyc-mr1-dev am:
bbb844f94d
am:
2ab7eed703
Change-Id: Ie1568a0787cd62af59dcde31623573ea84fe5e81
Anna Galusza [Fri, 22 Jul 2016 21:16:25 +0000 (21:16 +0000)]
Fix font and display size settings pages for small screens. am:
798b35ac09
am:
c3c3d0fb44
Change-Id: I669368001b45899691044ff59d0a2e13f7dff49a
Anna Galusza [Fri, 22 Jul 2016 21:13:16 +0000 (21:13 +0000)]
Merge \"Fix font and display size settings pages for small screens.\" into nyc-mr1-dev
am:
bbb844f94d
Change-Id: Id52f78751ced368a8119abe8594982d289416da2
Anna Galusza [Fri, 22 Jul 2016 21:13:16 +0000 (21:13 +0000)]
Fix font and display size settings pages for small screens.
am:
798b35ac09
Change-Id: I22f9c500152904bfc593e8c2907ecec7cf36d009
Anna Galusza [Fri, 22 Jul 2016 21:09:35 +0000 (21:09 +0000)]
Merge "Fix font and display size settings pages for small screens." into nyc-mr1-dev
Fan Zhang [Fri, 22 Jul 2016 20:13:43 +0000 (20:13 +0000)]
Don\\'t allow changing data usage setting if uid is not app. am:
2a84bbcddb
am:
2bf9591d92
Change-Id: I6be689791541d34b426cae577418a3daddf92280
Fan Zhang [Fri, 22 Jul 2016 20:11:11 +0000 (20:11 +0000)]
Don\'t allow changing data usage setting if uid is not app.
am:
2a84bbcddb
Change-Id: I2584cabeef21606a49d4921027707a36ace324b9
Anna Galusza [Fri, 15 Jul 2016 00:10:35 +0000 (17:10 -0700)]
Fix font and display size settings pages for small screens.
This was particularly broken in split-screen mode.
Bug:
29835212
Change-Id: I141f659e2d2d282d5af1ae97d6c798e53f71f766
Justin Klaassen [Fri, 22 Jul 2016 02:25:17 +0000 (19:25 -0700)]
Add NightDisplaySettingsActivity
- The Settings#ACTION_NIGHT_DISPLAY_SETTINGS action can be used by apps
to launch Night display settings directly.
Bug:
30291948
Change-Id: I5545bb7f0a467116454e5c44e207cbe91ddf9d43
Fan Zhang [Fri, 22 Jul 2016 17:03:52 +0000 (10:03 -0700)]
Don't allow changing data usage setting if uid is not app.
Bug:
30262890
Changing non-app UID's (eg system, firewalld) data usage will just crash.
Change-Id: I1c3f2504aae75f514f962fd54f4dcf240b3bcd81
Doris Ling [Fri, 22 Jul 2016 01:47:53 +0000 (01:47 +0000)]
Merge \\"Check for null activity before getting dashboard categories.\\" into nyc-mr1-dev am:
7b03ae69df
am:
8847c70b61
Change-Id: Iaa95737f7ee6bd086b6510619201d011d8a487a0
Doris Ling [Fri, 22 Jul 2016 01:47:12 +0000 (01:47 +0000)]
Check for null activity before getting dashboard categories. am:
b7e650c6f7
am:
4ec4b64b9d
Change-Id: Id96c017083cc49abbdc3cc6122ea277fe3c78755
Fan Zhang [Fri, 22 Jul 2016 01:47:11 +0000 (01:47 +0000)]
Fix crash when starting Settings -> Display -> Font size am:
cafe6972a9
am:
2ef88c5c11
Change-Id: Ib8856e87d08d58c43cbeb6da73ea2c2bc9418247
Sunny Goyal [Fri, 22 Jul 2016 01:47:11 +0000 (01:47 +0000)]
Merge \\"Updating the shortcut icons for Settings app\\" into nyc-mr1-dev am:
fe9bf6d9d1
am:
f00a2babd9
Change-Id: I37752dc6e9d4102bd08fd4eb517dfef44d0ecd94
Sunny Goyal [Fri, 22 Jul 2016 01:47:10 +0000 (01:47 +0000)]
Updating the shortcut icons for Settings app am:
b67291a274
am:
b828370049
Change-Id: Ib56bb6ebd6cb10097164d706da8035cac7d4e310
Bill Yi [Fri, 22 Jul 2016 01:47:09 +0000 (01:47 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
2ece9e4894 -s ours
am:
7e2d253106 -s ours
Change-Id: I4e5d485f1dbded93caa295deddecd61db52f2cd0
Bill Yi [Fri, 22 Jul 2016 01:45:57 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE am:
1dc5c8bcbf -s ours
am:
cd2e8c4cda -s ours
Change-Id: Ica989e233d5edcf1c13efb8fe89f84bd88d64e18
Thierry Strudel [Fri, 22 Jul 2016 01:45:56 +0000 (01:45 +0000)]
Merge changes from topic \\'enable_persist_kernel_log\\' into nyc-mr1-dev am:
8f3c7dd719
am:
3a06792cc6
Change-Id: I77f8a86340e3e18b969986b38732c9fea30065df
Mark Salyzyn [Fri, 22 Jul 2016 01:45:55 +0000 (01:45 +0000)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd am:
bdbd2d984e
am:
37f2668eac
Change-Id: Ie9be8ac339fb7eb8a80cc9fadcc8e535c0e4ece0
Mark Salyzyn [Fri, 22 Jul 2016 01:45:54 +0000 (01:45 +0000)]
Settings: add logpersist kernel only selection am:
78dd2e2c74
am:
b5ba827dbb
Change-Id: I9342571c0d18ec86257f8745af8a64d56f43b4a4
Mark Salyzyn [Fri, 22 Jul 2016 01:45:53 +0000 (01:45 +0000)]
Settings: add logpersist selection (actions) am:
c8b1c3ec22 -s ours
am:
3aee719c59
Change-Id: I124b7540fbc912f99bf80edf3baf23feac11e3f5
Doris Ling [Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)]
Merge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
am:
7b03ae69df
Change-Id: Ic16c06b1ced6c4b9f37d0c5e8fc0ecc5a450044f
Doris Ling [Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)]
Check for null activity before getting dashboard categories.
am:
b7e650c6f7
Change-Id: I26f8c96189d3390055a7dd02680da57d2c2ed2cb
Fan Zhang [Fri, 22 Jul 2016 01:42:45 +0000 (01:42 +0000)]
Fix crash when starting Settings -> Display -> Font size
am:
cafe6972a9
Change-Id: I19912b25028cac863d990e01cda1b31b40a183d7
Sunny Goyal [Fri, 22 Jul 2016 01:42:44 +0000 (01:42 +0000)]
Merge \"Updating the shortcut icons for Settings app\" into nyc-mr1-dev
am:
fe9bf6d9d1
Change-Id: Iaf16d11e30a19fe7a9c58e34d3b15045bd9e3d9a
Sunny Goyal [Fri, 22 Jul 2016 01:42:44 +0000 (01:42 +0000)]
Updating the shortcut icons for Settings app
am:
b67291a274
Change-Id: I7ca2cc1587c561313f6d43217c88119496866847
Bill Yi [Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
2ece9e4894 -s ours
Change-Id: Ie5649d4576ae56c27a75b8fcca8c10124feab9db
Bill Yi [Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)]
Import translations. DO NOT MERGE
am:
1dc5c8bcbf -s ours
Change-Id: I46c2ec6a95f04096b65e4aae83f9264da32f7441
Mark Salyzyn [Fri, 22 Jul 2016 01:41:49 +0000 (01:41 +0000)]
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am:
8f3c7dd719
Change-Id: I9d6ee829237cfa831f6ae691df5221c1baacc728
Mark Salyzyn [Fri, 22 Jul 2016 01:40:55 +0000 (01:40 +0000)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
am:
bdbd2d984e
Change-Id: I77d76c9c8a85bb4e0c9314943b291eab00669ee0
Mark Salyzyn [Fri, 22 Jul 2016 01:40:24 +0000 (01:40 +0000)]
Settings: add logpersist kernel only selection
am:
78dd2e2c74
Change-Id: I000f5830e70083212607a1f971d83fe9f48d4779
Mark Salyzyn [Fri, 22 Jul 2016 01:39:52 +0000 (01:39 +0000)]
Settings: add logpersist selection (actions)
am:
c8b1c3ec22 -s ours
Change-Id: Ia32d1a251d0fc215c651d47373dac539dcb0c21a
Doris Ling [Thu, 21 Jul 2016 20:58:21 +0000 (20:58 +0000)]
Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev
Fan Zhang [Thu, 21 Jul 2016 20:28:19 +0000 (13:28 -0700)]
Fix crash when starting Settings -> Display -> Font size
Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes:
30279736
Doris Ling [Thu, 21 Jul 2016 19:22:17 +0000 (12:22 -0700)]
Check for null activity before getting dashboard categories.
In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.
Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes:
30278854
Sunny Goyal [Thu, 21 Jul 2016 18:27:33 +0000 (18:27 +0000)]
Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev
Sunny Goyal [Thu, 21 Jul 2016 00:18:33 +0000 (17:18 -0700)]
Updating the shortcut icons for Settings app
Bug:
30224034
Bug:
30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66
TreeHugger Robot [Thu, 21 Jul 2016 04:32:47 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Thierry Strudel [Thu, 21 Jul 2016 04:07:22 +0000 (04:07 +0000)]
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
* changes:
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
Settings: add logpersist kernel only selection
Settings: add logpersist selection (actions)
Bill Yi [Thu, 21 Jul 2016 03:05:32 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import
Doris Ling [Thu, 21 Jul 2016 02:49:41 +0000 (02:49 +0000)]
Merge \\"Get gestures animation preview image in async loader.\\" into nyc-mr1-dev am:
fd922cabd9
am:
8668aa0a8f
Change-Id: I01680b9241312c22ecf7539d6abc73a90e4228eb
Doris Ling [Thu, 21 Jul 2016 02:47:12 +0000 (02:47 +0000)]
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
am:
fd922cabd9
Change-Id: I6975f268808cd5f9521cba6922120c667010023d
TreeHugger Robot [Thu, 21 Jul 2016 02:43:37 +0000 (02:43 +0000)]
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 01:38:22 +0000 (01:38 +0000)]
Merge \\"Revert \\"Revert \\"Error colors to point to frameworks instead of hard-coding them\\"\\"\\" into nyc-mr1-dev am:
d739ea38fb
am:
1da5d326a1
Change-Id: Iff841d790e9c840a5b24c82740b802d538c930e1
Matthew Fritze [Thu, 21 Jul 2016 01:28:39 +0000 (18:28 -0700)]
resolve merge conflicts of
21b446c to master
Change-Id: I38d1f88f03505d690ccd1739c42e8d34ef87890f
Matthew Fritze [Thu, 21 Jul 2016 01:24:09 +0000 (01:24 +0000)]
Merge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\"\" into nyc-mr1-dev
am:
d739ea38fb
Change-Id: I996cd07af5b613d04588f533d979decffb437daa
Doris Ling [Tue, 19 Jul 2016 22:46:50 +0000 (15:46 -0700)]
Get gestures animation preview image in async loader.
When user scrolls in Gestures Settings, the textureview used for the
animation video will be destroyed if the view is scrolled outside the
screen. When the view is scrolled back in, a slight flicker is seen as
the animation video is not instantly made available on the new surface
texture. We are now retrieving the preview image in an async loader
after the preference is created, so that it will not delay the original
loading of the gestures settings page, but the preview will be made
available while we initialize the animation video in the new surface
texture.
Bug:
29790087
Change-Id: I83f4a5bc4f24b7aab4c0cc851cb524c10e74f328
Matthew Fritze [Thu, 21 Jul 2016 01:06:15 +0000 (01:06 +0000)]
Merge \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\" into nyc-mr1-dev
am:
c49c496f1c
Change-Id: Ibf5577a03184aed6ee78704cae48e6d817267873
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 01:03:45 +0000 (01:03 +0000)]
Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
This reverts commit
f179f845e50837a069383f3b268f643c4d2cfad8.
Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
Daniel Nishi [Thu, 21 Jul 2016 01:02:16 +0000 (01:02 +0000)]
Merge \\"Update the Bluetooth pin pairing view to the new spec.\\" into nyc-mr1-dev am:
391f67e484
am:
b0bb093519
Change-Id: I7c6719cbaf70bf9ff92e7880020d977dbcdd685b
Matthew Fritze [Thu, 21 Jul 2016 00:59:33 +0000 (00:59 +0000)]
Merge \\"Error colors to point to frameworks instead of hard-coding them\\" into nyc-mr1-dev am:
d25148c8f7
am:
4a8695ed1e -s ours
Change-Id: I92b60a1f949a1ce73df5afebf57726921d8f9b4e
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:55:21 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks instead of hard-coding them"
This reverts commit
ae63c3db14f4ddf89d33df894af53fb066226da3.
Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
Daniel Nishi [Wed, 20 Jul 2016 23:57:46 +0000 (23:57 +0000)]
Merge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev
am:
391f67e484
Change-Id: Id1f72339ea39ce4d734f9cc869c5c2c2a4ee233d
Daniel Nishi [Wed, 20 Jul 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev
Matthew Fritze [Wed, 20 Jul 2016 23:47:28 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks instead of hard-coding them\" into nyc-mr1-dev
am:
d25148c8f7
Change-Id: Ia69404fbaad8485440b2f45f26820a70976bbf7d
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev
Daniel Nishi [Tue, 19 Jul 2016 19:41:46 +0000 (12:41 -0700)]
Update the Bluetooth pin pairing view to the new spec.
Bug:
30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835
Tony Mak [Wed, 20 Jul 2016 19:51:26 +0000 (19:51 +0000)]
Merge \\"Should not report unsuccessful attempt if pattern size < minimal size\\" into nyc-mr1-dev am:
9d83a9fbbb
am:
3a681a32a8
Change-Id: Id95c0d1ea210bf153ec26a83fc6789296f0070df
Abodunrinwa Toki [Wed, 20 Jul 2016 19:51:25 +0000 (19:51 +0000)]
Merge \\"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\\" into nyc-mr1-dev am:
5af83786f7
am:
1fd447e778 -s ours
Change-Id: I53a2cf80a9eeb3a2049e706fd01501d2f6a263d8
Doris Ling [Wed, 20 Jul 2016 19:51:24 +0000 (19:51 +0000)]
Merge \\"Combine setCategories() and setSuggestions() in DashboardAdapter.\\" into nyc-mr1-dev am:
7e70fd1166
am:
b3055b083a
Change-Id: I1c61400fee835a8297d754455596e530b1d006c2
Daniel Nishi [Wed, 20 Jul 2016 19:51:17 +0000 (19:51 +0000)]
Merge \\"Add a help item for the Help & Feedback for the Storage Manager.\\" into nyc-mr1-dev am:
dd1c51a3e4
am:
c354537c37
Change-Id: I76473c677d5b1be97ec78ac084325a6939b02e2e
Michael Wright [Wed, 20 Jul 2016 19:49:18 +0000 (19:49 +0000)]
Merge \\"Color transforms are now color modes.\\" into nyc-mr1-dev am:
111e1dc6b3
am:
87fca0df00
Change-Id: I0d3290d06d9186bdf0f05061d24a20e474e50116
Tony Mak [Wed, 20 Jul 2016 19:26:54 +0000 (19:26 +0000)]
Merge \"Should not report unsuccessful attempt if pattern size < minimal size\" into nyc-mr1-dev
am:
9d83a9fbbb
Change-Id: I1f9f254baebab5b14fe298791e11887dbd4220c6
Tony Mak [Wed, 20 Jul 2016 19:20:54 +0000 (19:20 +0000)]
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
Abodunrinwa Toki [Wed, 20 Jul 2016 18:57:18 +0000 (18:57 +0000)]
Merge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into nyc-mr1-dev
am:
5af83786f7
Change-Id: I786b8815d0e928b7bb54a93e3fb633af1d206916
Doris Ling [Wed, 20 Jul 2016 18:51:17 +0000 (18:51 +0000)]
Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
am:
7e70fd1166
Change-Id: Id8f655e0a9b29369a57eea3c5140cf47def7cc36
Daniel Nishi [Wed, 20 Jul 2016 18:51:14 +0000 (18:51 +0000)]
Merge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc-mr1-dev
am:
dd1c51a3e4
Change-Id: I80acbbc35e376f2e353aa955bfd66e4e2a63f71e
Abodunrinwa Toki [Wed, 20 Jul 2016 18:50:15 +0000 (18:50 +0000)]
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
Michael Wright [Wed, 20 Jul 2016 18:49:59 +0000 (18:49 +0000)]
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
am:
111e1dc6b3
Change-Id: I6536baf47e102331fa87112d4f0b9d15ec432d2a
Doris Ling [Wed, 20 Jul 2016 18:02:42 +0000 (18:02 +0000)]
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
Chad Brubaker [Wed, 20 Jul 2016 17:37:06 +0000 (17:37 +0000)]
Merge "Dont use FLAG_ENCRYPT for certificates"
Daniel Nishi [Wed, 20 Jul 2016 17:33:40 +0000 (17:33 +0000)]
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 17:21:33 +0000 (17:21 +0000)]
Merge "Color transforms are now color modes." into nyc-mr1-dev
Fan Zhang [Wed, 20 Jul 2016 17:04:57 +0000 (17:04 +0000)]
Merge \\"Let talkback announce category name in Settings.\\" into nyc-mr1-dev am:
19d0f73c48
am:
ed9bd61a4c
Change-Id: Ib001531f30414a335dd1a438b735aedaa1dcd3c4
Fan Zhang [Wed, 20 Jul 2016 17:00:04 +0000 (17:00 +0000)]
Merge \"Let talkback announce category name in Settings.\" into nyc-mr1-dev
am:
19d0f73c48
Change-Id: I612291219ec34682a50be2bae39a79c7bc320a36
TreeHugger Robot [Wed, 20 Jul 2016 16:51:13 +0000 (16:51 +0000)]
Merge "Let talkback announce category name in Settings." into nyc-mr1-dev
Bill Yi [Wed, 20 Jul 2016 14:48:01 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE am:
b5c2131de4 -s ours
am:
06dac5c117 -s ours
Change-Id: Ia538dcd37274a8866b1fef5d2862e20210e97525
Bill Yi [Wed, 20 Jul 2016 14:45:00 +0000 (14:45 +0000)]
Import translations. DO NOT MERGE
am:
b5c2131de4 -s ours
Change-Id: I090280543af960bd345e2e7be70a8efd74de979a
Bill Yi [Wed, 20 Jul 2016 14:34:39 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a
Bill Yi [Wed, 20 Jul 2016 14:18:31 +0000 (14:18 +0000)]
Import translations. DO NOT MERGE am:
708c6264ac -s ours
am:
9471dbdd6a -s ours
Change-Id: Id99a5960215970c325ffe671e236d4aeb68d05cf
Bill Yi [Wed, 20 Jul 2016 14:15:59 +0000 (14:15 +0000)]
Import translations. DO NOT MERGE
am:
708c6264ac -s ours
Change-Id: Icd36c43f8ba611bda0c1c88589cd7b1b86f6e716
Bill Yi [Wed, 20 Jul 2016 14:09:37 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
Jason Monk [Wed, 20 Jul 2016 13:37:02 +0000 (13:37 +0000)]
Merge \\"Protect against work conditional crash\\" into nyc-mr1-dev am:
bd6a4f9066
am:
ff1132470b
Change-Id: I15c8a0c428681cf787dcdc640b0512c974a4710a
Jason Monk [Wed, 20 Jul 2016 13:33:57 +0000 (13:33 +0000)]
Merge \"Protect against work conditional crash\" into nyc-mr1-dev
am:
bd6a4f9066
Change-Id: I6072b6235abb35da9ecac1f41b01cf82e75d868b
Jason Monk [Wed, 20 Jul 2016 13:28:13 +0000 (13:28 +0000)]
Merge "Protect against work conditional crash" into nyc-mr1-dev
André Lago [Wed, 20 Jul 2016 11:31:19 +0000 (11:31 +0000)]
Merge "Improved always_on_vpn disabled text"
Andre Lago [Tue, 19 Jul 2016 14:26:34 +0000 (15:26 +0100)]
Improved always_on_vpn disabled text
When the admin disallowed config vpn, always-on vpn description was
"Disabled by admin", so it was changed to "Controlled by admin" which
suits it better.
Bug:
29265180
Change-Id: If0da6b9ef3ce7179adeda53203c6caf4e3e9a995
Tony Mak [Wed, 20 Jul 2016 08:55:25 +0000 (09:55 +0100)]
Should not report unsuccessful attempt if pattern size < minimal size
It is to align the behavior in personal side lock screen.
Change-Id: I811e72405615fbed85c2a4dc6b6cec51e4ad54f0
Fix:
30215101
Justin Klaassen [Wed, 20 Jul 2016 02:55:05 +0000 (02:55 +0000)]
Merge \\"Add Night display settings conditional\\" into nyc-mr1-dev am:
b57ee0e02f
am:
5d8b1ca588
Change-Id: I64c13bb813f12cff6786a1021647b65bc226e384
Fan Zhang [Wed, 20 Jul 2016 02:54:20 +0000 (02:54 +0000)]
Merge \\"Add ripple effect on all preference tiles.\\" into nyc-mr1-dev am:
99da60a35f
am:
0780fd8b99
Change-Id: I87eac5dab4a2c1bb46a894e44fa1e75ba31ac49d
Justin Klaassen [Wed, 20 Jul 2016 01:06:41 +0000 (01:06 +0000)]
Merge \"Add Night display settings conditional\" into nyc-mr1-dev
am:
b57ee0e02f
Change-Id: I72715ad005fade9376d036ebe7abfde0c89bd1e5
Fan Zhang [Wed, 20 Jul 2016 01:06:40 +0000 (01:06 +0000)]
Merge \"Add ripple effect on all preference tiles.\" into nyc-mr1-dev
am:
99da60a35f
Change-Id: I4b089e31df8dd95a4c08d2b845e82f55b522f680
TreeHugger Robot [Wed, 20 Jul 2016 01:00:23 +0000 (01:00 +0000)]
Merge "Add Night display settings conditional" into nyc-mr1-dev
OSDN Git Service
