OSDN Git Service
Jeff Sharkey [Thu, 28 Jul 2016 00:12:21 +0000 (00:12 +0000)]
Warn users when selecting non-Direct Boot apps. am:
4a8136b51b
am:
f3449fb81e
Change-Id: Id6b2d3ebd5789a3077b9474922bc0a1bac9d0801
Jeff Sharkey [Wed, 27 Jul 2016 23:20:40 +0000 (23:20 +0000)]
Warn users when selecting non-Direct Boot apps.
am:
4a8136b51b
Change-Id: I522f6eb292f6052d56b7b2b76063e5c85ef2ac02
Justin Klaassen [Wed, 27 Jul 2016 23:19:40 +0000 (23:19 +0000)]
Night display settings UI v2 am:
7335b6505d
am:
2902f61b16
Change-Id: I998bc6905b171daebf2db3f34add3c4e1dd02316
Fan Zhang [Wed, 27 Jul 2016 23:19:38 +0000 (23:19 +0000)]
Merge \\"Catch RejectedExecutionException when loading app data.\\" into nyc-mr1-dev am:
0a2a3a6ac1
am:
ede05ded5f
Change-Id: I0730be4db65d0cafc06f1f098a489c6396c00c9a
Fan Zhang [Wed, 27 Jul 2016 23:19:36 +0000 (23:19 +0000)]
Catch RejectedExecutionException when loading app data. am:
c63d245779
am:
c1972573b1
Change-Id: Ie2aa8d4ca93ff7e6e0a2f001825ab30ba50737d4
Justin Klaassen [Wed, 27 Jul 2016 22:23:08 +0000 (22:23 +0000)]
Night display settings UI v2
am:
7335b6505d
Change-Id: Ib3a36470757ad88c33e6eac7ac6e2ef24e4f3beb
Fan Zhang [Wed, 27 Jul 2016 22:23:08 +0000 (22:23 +0000)]
Merge \"Catch RejectedExecutionException when loading app data.\" into nyc-mr1-dev
am:
0a2a3a6ac1
Change-Id: I921fa24adb2826b4c0b76efcae4eb6dd7ab78a59
Fan Zhang [Wed, 27 Jul 2016 22:23:07 +0000 (22:23 +0000)]
Catch RejectedExecutionException when loading app data.
am:
c63d245779
Change-Id: Ib440a985ccf2808e71d1e71462793907f0381388
Jeff Sharkey [Wed, 27 Jul 2016 18:53:34 +0000 (12:53 -0600)]
Warn users when selecting non-Direct Boot apps.
Certain apps like Phone, SMS, Emergency Info, and IME are critical
enough that they ideally need to be runnable before the device is
unlocked after a reboot. Users can still pick non-Direct Boot aware
apps, but this change now warns users that the selected app won't be
runnable until after unlocking.
Bug:
27196876
Change-Id: I0498904d2f664fb41e8c1e6bb30d1cbf437cf4b9
Justin Klaassen [Wed, 27 Jul 2016 03:57:27 +0000 (20:57 -0700)]
Night display settings UI v2
Bug:
30155646
Change-Id: I912e90e5ec5e8d7426c68484da8396219a40c5ad
Fan Zhang [Wed, 27 Jul 2016 01:22:44 +0000 (01:22 +0000)]
Merge \"Catch RejectedExecutionException when loading app data.\" into nyc-mr1-dev
am:
0a2a3a6ac1
Change-Id: Ib75835b3e2f3780f91e5c53d73db992254985733
Fan Zhang [Wed, 27 Jul 2016 01:22:41 +0000 (01:22 +0000)]
Catch RejectedExecutionException when loading app data.
am:
c63d245779
Change-Id: Ic7ede8eade2561b36cea76169e6843f99de7ab7d
Justin Klaassen [Wed, 27 Jul 2016 01:22:37 +0000 (01:22 +0000)]
Merge \"Only set fullIndex flag when performing a full update\" into nyc-mr1-dev
am:
2d0c3f072b
Change-Id: If84084066e411b6e9c1620bc8962824b8df13a2a
Justin Klaassen [Wed, 27 Jul 2016 01:22:34 +0000 (01:22 +0000)]
Only set fullIndex flag when performing a full update
am:
5d219a2cfa
Change-Id: I474d800f6f38a6949deac3c38f80bcd807da5106
TreeHugger Robot [Wed, 27 Jul 2016 00:58:24 +0000 (00:58 +0000)]
Merge "Catch RejectedExecutionException when loading app data." into nyc-mr1-dev
TreeHugger Robot [Tue, 26 Jul 2016 22:47:29 +0000 (22:47 +0000)]
Merge "Only set fullIndex flag when performing a full update" into nyc-mr1-dev
Jeff Sharkey [Tue, 26 Jul 2016 22:12:45 +0000 (22:12 +0000)]
Merge \"Offer trampoline to help articles.\" into nyc-mr1-dev
am:
fc86ca6f0d
Change-Id: I6a0afb3b293827e687c73a2f625409d3ed6efb4a
Jeff Sharkey [Tue, 26 Jul 2016 22:10:44 +0000 (22:10 +0000)]
Offer trampoline to help articles.
am:
4f425c890b
Change-Id: I142124d64548bbd5c4dda19fab59e9a337c90226
Jeff Sharkey [Tue, 26 Jul 2016 21:52:04 +0000 (21:52 +0000)]
Merge "Offer trampoline to help articles." into nyc-mr1-dev
Justin Klaassen [Tue, 26 Jul 2016 21:29:52 +0000 (14:29 -0700)]
Only set fullIndex flag when performing a full update
Previously UpdateData#fullIndex was default true which meant if a
partial update came in before a call to Index#update() then the
partial update would be treated as a full index and future calls
to Index#update() would be ignored.
Bug:
30366360
Change-Id: I6e2738c25c9623f49171ecba0f3e0ce0076b7e42
Fan Zhang [Tue, 26 Jul 2016 19:16:45 +0000 (12:16 -0700)]
Catch RejectedExecutionException when loading app data.
Default thread pool from AsyncTask can queue up to a certain number of
tasks. We will use a custom pool with enough queue size to load app
data.
Fixes:
30355247
Change-Id: I5ad4c340191c785463011c1698d1d4625aba44ec
Fan Zhang [Mon, 25 Jul 2016 23:08:19 +0000 (23:08 +0000)]
Merge \"Revert \"About Phone\" summary back to Android version.\" into nyc-mr1-dev
am:
2dc574e59a
Change-Id: Ie579da177f742cf5d912d86e1c8a2b93380cd921
Fan Zhang [Mon, 25 Jul 2016 23:08:17 +0000 (23:08 +0000)]
Revert \"About Phone\" summary back to Android version.
am:
fd4f729e1f
Change-Id: I77f3ed00516c02f8ca6ad888c166ed07a2f0f7f9
Fan Zhang [Mon, 25 Jul 2016 23:08:15 +0000 (23:08 +0000)]
Merge \"Refresh state after loading conditions from xml.\" into nyc-mr1-dev
am:
58e217b180
Change-Id: I56d396108b46aba406ebf9d490c749bbb3e90c5a
Fan Zhang [Mon, 25 Jul 2016 23:08:14 +0000 (23:08 +0000)]
Refresh state after loading conditions from xml.
am:
a0ebd1a9f0
Change-Id: I6ce26907b52d4b128dca541e291396f71d34d02e
Jeff Sharkey [Tue, 19 Jul 2016 00:28:55 +0000 (18:28 -0600)]
Offer trampoline to help articles.
This allows other parts of the system internals to re-use common
logic for building help links, and it allows all help links to live
in a single common overlay.
Adds a help link slot for "Android is upgrading" notification.
Bug:
30033319,
30122837
Change-Id: I7dec3e63cfb8c7a8ee9a562cc61cb70f3f99fdae
Fan Zhang [Mon, 25 Jul 2016 22:13:27 +0000 (22:13 +0000)]
Merge "Revert "About Phone" summary back to Android version." into nyc-mr1-dev
Fan Zhang [Mon, 25 Jul 2016 22:13:17 +0000 (22:13 +0000)]
Merge "Refresh state after loading conditions from xml." into nyc-mr1-dev
Fan Zhang [Mon, 25 Jul 2016 21:20:40 +0000 (14:20 -0700)]
Revert "About Phone" summary back to Android version.
Change-Id: Icc834b8fb1fd9235092cee720c904c8532b8e3fc
Fixes:
30355258
Bug:
28419411
Fan Zhang [Mon, 25 Jul 2016 19:55:36 +0000 (12:55 -0700)]
Refresh state after loading conditions from xml.
Fixes:
30330909
When start Settings, conditions is loaded from a xml with potentially
stale state. ConditionLoader needs to refresh states after reading xml
to make sure they are up to date.
Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061
Phil Weaver [Mon, 25 Jul 2016 20:34:42 +0000 (20:34 +0000)]
Merge \"Fix return when virtual keyboard setting changes.\" into nyc-mr1-dev
am:
0bda6fb550
Change-Id: Ib2c6ea1ca9be496408ad6a201dfb24b2c3262f36
Phil Weaver [Mon, 25 Jul 2016 20:34:41 +0000 (20:34 +0000)]
Fix return when virtual keyboard setting changes.
am:
3587914cef
Change-Id: I29b64c04eeb036f92ff937b70e247aaf0b2eb817
Phil Weaver [Mon, 25 Jul 2016 20:23:06 +0000 (20:23 +0000)]
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 19:19:19 +0000 (19:19 +0000)]
Merge \"Fix multiple bluetooth devices bug\" into nyc-mr1-dev
am:
d5b3043bba
Change-Id: Iae3c6d3f818f72277db8e0dd3ae41c92a7d748ea
Jason Monk [Mon, 25 Jul 2016 19:19:19 +0000 (19:19 +0000)]
Fix multiple bluetooth devices bug
am:
6666f9cc37
Change-Id: I71efa3c45fd19a654cbc3d92b576b684d6bab9e3
Jason Monk [Mon, 25 Jul 2016 18:35:56 +0000 (18:35 +0000)]
Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev
Makoto Onuki [Mon, 25 Jul 2016 18:32:18 +0000 (18:32 +0000)]
Merge \"Improve string comment\" into nyc-mr1-dev
am:
e8bed6d959
Change-Id: I33e157d225765f1b4fc549d0a6f05e26af39ec85
Makoto Onuki [Mon, 25 Jul 2016 18:32:17 +0000 (18:32 +0000)]
Improve string comment
am:
8e8bcb6900
Change-Id: I53c6a4ea4fa17d3d5bc6c87d559dbe07f6178cca
Makoto Onuki [Mon, 25 Jul 2016 18:12:00 +0000 (18:12 +0000)]
Merge "Improve string comment" into nyc-mr1-dev
Bill Yi [Mon, 25 Jul 2016 17:03:33 +0000 (17:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
bcc18fa732 -s ours
Change-Id: I2e42203f39634b4f728f5a5cfb15179249bf6600
Bill Yi [Mon, 25 Jul 2016 17:03:32 +0000 (17:03 +0000)]
Import translations. DO NOT MERGE
am:
4f77347f7d -s ours
Change-Id: I2ec21b269a25155987202b5f83e4407b04995417
TreeHugger Robot [Mon, 25 Jul 2016 16:46:07 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Fan Zhang [Mon, 25 Jul 2016 16:13:25 +0000 (16:13 +0000)]
Add non-transparent background to dashboard items.
am:
6b75a69195
Change-Id: I5e2a3d427e60f64b31c6585be3628fba2151a783
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes:
29314480
Bill Yi [Mon, 25 Jul 2016 14:34:40 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I460a8a0f711298b1658451774c021e8d4a3d2087
Auto-generated-cl: translation import
Fan Zhang [Sat, 23 Jul 2016 00:14:48 +0000 (17:14 -0700)]
Add non-transparent background to dashboard items.
Bug:
30297664
Change-Id: Ia6173e8b0d5852a1c454ae466886f894c72e3e5f
Doris Ling [Fri, 22 Jul 2016 22:18:16 +0000 (22:18 +0000)]
Merge \"Fix scroll issue when going from Display->Ambient Display to Moves.\" into nyc-mr1-dev
am:
0fd853ad66
Change-Id: Iabb342eee3888877c4f941bc941f14cf2ea7f4a8
Doris Ling [Fri, 22 Jul 2016 22:18:15 +0000 (22:18 +0000)]
Fix scroll issue when going from Display->Ambient Display to Moves.
am:
2f92d751e0
Change-Id: I2854643c20fd1136a2d789dc96fa24018042f71b
Doris Ling [Fri, 22 Jul 2016 22:14:00 +0000 (22:14 +0000)]
Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev
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: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
Doris Ling [Fri, 22 Jul 2016 20:28:21 +0000 (13:28 -0700)]
Fix scroll issue when going from Display->Ambient Display to Moves.
Move the scroll-to extra param to inside the launch intent of the doze
preference screen for it to take effect. The original extra param is
added to the preference screen itself as we were defining the fragment
to launch previously.
Change-Id: Id3e8cfbe61b46be2a5945da7e531f1a3c8b1454f
Fixes:
30262357
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: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
Makoto Onuki [Thu, 21 Jul 2016 17:35:47 +0000 (10:35 -0700)]
Improve string comment
Bug
30210359
Bug
30207992
Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
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: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: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
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: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
OSDN Git Service
