OSDN Git Service
Fan Zhang [Wed, 27 Jul 2016 01:49:07 +0000 (01:49 +0000)]
Catch RejectedExecutionException when loading app data. am:
c63d245779
am:
b512c7a268
Change-Id: I2e47c831ab98a4a2c52c410817b8be12b4a0a250
Justin Klaassen [Wed, 27 Jul 2016 01:49:06 +0000 (01:49 +0000)]
Merge \\"Only set fullIndex flag when performing a full update\\" into nyc-mr1-dev am:
2d0c3f072b
am:
7475d1c09a
Change-Id: I9f025b0abb33ff66e32dbbf0afe2e5a4df676328
Justin Klaassen [Wed, 27 Jul 2016 01:49:05 +0000 (01:49 +0000)]
Only set fullIndex flag when performing a full update am:
5d219a2cfa
am:
57840c76be
Change-Id: I34e1edf4e87964cd6762edee77a0001222e8b08f
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 [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:16:04 +0000 (22:16 +0000)]
Merge \\"Offer trampoline to help articles.\\" into nyc-mr1-dev am:
fc86ca6f0d
am:
c14b790d2f
Change-Id: I33ff2fb6238e88d8222022ba8fc99f05f67761b2
Jeff Sharkey [Tue, 26 Jul 2016 22:16:03 +0000 (22:16 +0000)]
Offer trampoline to help articles. am:
4f425c890b
am:
aaaf41d982
Change-Id: Ib10ccc2348f1fa9d5687941c38ca7f28fcb0465e
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:15:55 +0000 (23:15 +0000)]
Merge \\"Revert \\"About Phone\\" summary back to Android version.\\" into nyc-mr1-dev am:
2dc574e59a
am:
dde1feddbd
Change-Id: Id992079c812fe1bd267b0d4d8d37d05599612da6
Fan Zhang [Mon, 25 Jul 2016 23:15:54 +0000 (23:15 +0000)]
Revert \\"About Phone\\" summary back to Android version. am:
fd4f729e1f
am:
942e24d46f
Change-Id: I4e07005864ee39324ecc381a6861acaf11292d54
Fan Zhang [Mon, 25 Jul 2016 23:15:54 +0000 (23:15 +0000)]
Merge \\"Refresh state after loading conditions from xml.\\" into nyc-mr1-dev am:
58e217b180
am:
a988f59ce8
Change-Id: Id2caae5d5f1f0e714ed9b65d87939d2a2eba5109
Fan Zhang [Mon, 25 Jul 2016 23:15:53 +0000 (23:15 +0000)]
Refresh state after loading conditions from xml. am:
a0ebd1a9f0
am:
91a1c1cad0
Change-Id: Iae268150219731a98c08784f313a45cc7545cf6a
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:36:37 +0000 (20:36 +0000)]
Merge \\"Fix return when virtual keyboard setting changes.\\" into nyc-mr1-dev am:
0bda6fb550
am:
a1ef5a8590
Change-Id: I0ed8be9f88ffb665dc90680bcb73de607736cb21
Phil Weaver [Mon, 25 Jul 2016 20:36:36 +0000 (20:36 +0000)]
Fix return when virtual keyboard setting changes. am:
3587914cef
am:
fc3352e585
Change-Id: I5aa18d8695ad07b01f2f5a092ae4e98855579afe
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:22:52 +0000 (19:22 +0000)]
Merge \\"Fix multiple bluetooth devices bug\\" into nyc-mr1-dev am:
d5b3043bba
am:
d50e012545
Change-Id: Ia0c826da16ac5a5c1a164398c4b3c8a0c90f18c2
Jason Monk [Mon, 25 Jul 2016 19:22:51 +0000 (19:22 +0000)]
Fix multiple bluetooth devices bug am:
6666f9cc37
am:
5129b26123
Change-Id: Ib0e78cb33e6bfb46c39674efd70f42832a21beb8
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
Svetoslav Ganov [Mon, 25 Jul 2016 18:43:38 +0000 (18:43 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
Makoto Onuki [Mon, 25 Jul 2016 18:36:22 +0000 (18:36 +0000)]
Merge \\"Improve string comment\\" into nyc-mr1-dev am:
e8bed6d959
am:
eb29897252
Change-Id: Ia4e068402c2d709bd6d8e7dfb611ec91b057c594
Makoto Onuki [Mon, 25 Jul 2016 18:36:22 +0000 (18:36 +0000)]
Improve string comment am:
8e8bcb6900
am:
282e662b4e
Change-Id: I91ca85dba7dc1aba8645d66f0db7c49aa8fbb122
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:23:16 +0000 (17:23 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
bcc18fa732 -s ours
am:
bab8334482 -s ours
Change-Id: Ief01345a7471e95e4562db537c6d37e086221d21
Bill Yi [Mon, 25 Jul 2016 17:23:14 +0000 (17:23 +0000)]
Import translations. DO NOT MERGE am:
4f77347f7d -s ours
am:
df340e3bf2 -s ours
Change-Id: Idfd3a2f4aa50cf490c72b1eec685d677d17aa8b8
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:48:02 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE"
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:35:39 +0000 (16:35 +0000)]
Add non-transparent background to dashboard items. am:
6b75a69195
am:
478c57eba2
Change-Id: Ie2181ef49bdc7807c45b201f00c89fdadbaed443
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
Robin Lee [Tue, 19 Jul 2016 15:10:39 +0000 (16:10 +0100)]
Include wifi certificates in settings
Deleting wifi certificates isn't supported yet since cascading the
removal back into wifi configs will need some easy way of enumerating
wifi configs first.
Bug:
29208062
Change-Id: I2d9d1ea7e0974701009bfa6ea162b8bc80806639
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
Bill Yi [Mon, 25 Jul 2016 13:45:37 +0000 (06:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97c5e8e2c638eeaf9348d0319cc16a4955a7f6bc
Auto-generated-cl: translation import
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
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:25:36 +0000 (22:25 +0000)]
Merge \\"Fix scroll issue when going from Display->Ambient Display to Moves.\\" into nyc-mr1-dev am:
0fd853ad66
am:
83b3647e0c
Change-Id: Ie0c087af1126f000747e78a3e7db09d88793e00b
Doris Ling [Fri, 22 Jul 2016 22:25:36 +0000 (22:25 +0000)]
Fix scroll issue when going from Display->Ambient Display to Moves. am:
2f92d751e0
am:
f6578b733c
Change-Id: Ic37876eb20db1f45d6938eecea00e84ab79a44ad
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
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
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: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
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: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
OSDN Git Service
