OSDN Git Service
Benjamin Franz [Thu, 21 Jul 2016 15:50:39 +0000 (15:50 +0000)]
Merge \\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours am:
662e2a7975
am:
461309a63a
Change-Id: Id36d384021feafabd71ff382ca8054da2f67a722
Billy Lamberta [Thu, 21 Jul 2016 15:50:37 +0000 (15:50 +0000)]
Merge \\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\" into nyc-dev am:
7dbcfcadd5
am:
4f93fdb999
Change-Id: I41fb264f3388716fb4ec08c058f2210752611228
Billy Lamberta [Thu, 21 Jul 2016 15:50:35 +0000 (15:50 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a
am:
576f482813
Change-Id: I3d6c2b990f67864969b14304066c6f853fd2708c
Amanda Kassay [Thu, 21 Jul 2016 15:50:33 +0000 (15:50 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3 am:
e9d58227bb
am:
0d6757dafd
Change-Id: I704345cd4efb8a1aa76f8bd24cfa782e16b176d7
Benjamin Franz [Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)]
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours
am:
662e2a7975
Change-Id: I453d98b170f1383ad41f5e73b8f0818240f4778d
Billy Lamberta [Thu, 21 Jul 2016 15:39:55 +0000 (15:39 +0000)]
Merge \"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\" into nyc-dev
am:
7dbcfcadd5
Change-Id: Id738efd3e5b66db417b45231defc240a144744b7
Billy Lamberta [Thu, 21 Jul 2016 15:39:52 +0000 (15:39 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f
am:
c7cffa3e6a
Change-Id: Ifa84e7599721abebb5093f5e932166737278ccfc
Amanda Kassay [Thu, 21 Jul 2016 15:39:48 +0000 (15:39 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3
am:
e9d58227bb
Change-Id: I29289c7aaaf34fb2889c8438f754b050b2dc2aec
Mark Lu [Thu, 21 Jul 2016 15:35:43 +0000 (15:35 +0000)]
Merge \\"docs: fixed \\'@\\' signs that were escaped improperly\\" into nyc-dev am:
a7ce29962c
am:
876f854c3e
Change-Id: I4dacd0136ff01983445ca68175f01bffd7842b9e
Benjamin Franz [Thu, 21 Jul 2016 15:27:28 +0000 (15:27 +0000)]
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9
am:
cb805b35f3 -s ours
Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09
Android Build Merger (Role) [Thu, 21 Jul 2016 15:22:31 +0000 (15:22 +0000)]
Merge "docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919" into nyc-dev
Mark Lu [Thu, 21 Jul 2016 15:22:14 +0000 (15:22 +0000)]
Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
am:
a7ce29962c
Change-Id: I7444f59361841b6e6051c8976869633eb1c0219a
Billy Lamberta [Thu, 21 Jul 2016 15:21:58 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am:
ef57498142
am:
ba633fc919
Change-Id: I819bc7a7568f4ea753b053338c7f73f64e80ec0e
Billy Lamberta [Thu, 21 Jul 2016 15:21:52 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am:
ef57498142
am:
9684f2cd2f
Change-Id: Idaeea63ba30ecb86a4f60955bb4937357ba4fd1b
Amanda Kassay [Thu, 21 Jul 2016 15:21:50 +0000 (15:21 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
am:
83fb75ded3
Change-Id: Ib5e4d45692c54beb3b4fafe89ebc0a5c19400359
Benjamin Franz [Thu, 21 Jul 2016 10:14:59 +0000 (10:14 +0000)]
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093
am:
87534f4ac9
Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3
Benjamin Franz [Thu, 21 Jul 2016 10:10:03 +0000 (10:10 +0000)]
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am:
3e582390b3
am:
7abd7ba093
Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
Benjamin Franz [Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)]
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am:
3e582390b3
Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
Bill Yi [Thu, 21 Jul 2016 04:06:17 +0000 (04:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
c3264b01ed -s ours
Change-Id: Ia217a988e8816741bca4a04ba2a27c7e09eaf249
TreeHugger Robot [Thu, 21 Jul 2016 04:02:06 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 21 Jul 2016 03:42:33 +0000 (03:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
28cb163056 -s ours
Change-Id: I909f8334846a92370d136722d1aa8eaa1aa162ca
Bill Yi [Thu, 21 Jul 2016 03:42:29 +0000 (03:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
50fd9a9ca4 -s ours
Change-Id: I92bcafd93bb2c1fe1818415b2f991fd677101dea
Bill Yi [Thu, 21 Jul 2016 03:42:25 +0000 (03:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
3638c9b330 -s ours
Change-Id: Ice6116e80bcca10df08e8d6b178911f0b266e922
Bill Yi [Thu, 21 Jul 2016 03:42:22 +0000 (03:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
dfb24a204f -s ours
Change-Id: I55132b678aa074c4f32794291208c794dc349a4e
Bill Yi [Thu, 21 Jul 2016 03:42:18 +0000 (03:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
09af2a1032 -s ours
Change-Id: Iacb267f7fb77bc555cbd537df6471f0b9c7a0007
Bill Yi [Thu, 21 Jul 2016 03:39:59 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
c1079364cb -s ours
Change-Id: I7abd0a0cce9a39061be91be90e26585f2bb5f5a4
Bill Yi [Thu, 21 Jul 2016 03:39:55 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
60858a45cd -s ours
Change-Id: I2b913190f77c1351e1b776f2bb319d550af309e3
Bill Yi [Thu, 21 Jul 2016 03:39:51 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
db89342ec6 -s ours
Change-Id: I5ee9264a116ad1ebd0b5b6d305e10fa3a1c3a77a
Bill Yi [Thu, 21 Jul 2016 03:39:48 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a9a03b5d7e -s ours
Change-Id: I54902004b078c6596c43eb0d35bf8376b6c7f11a
Bill Yi [Thu, 21 Jul 2016 03:39:44 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
98e71028c7 -s ours
Change-Id: I55b989091dad00ec6a9380f9b59f42be8d716d76
TreeHugger Robot [Thu, 21 Jul 2016 03:33:19 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:33:10 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:50 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:42 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:19 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:00 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:51 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:31 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:23 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:01 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 21 Jul 2016 02:38:44 +0000 (19:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: If251730b4f9eb5fb6f9e0ce7fd2e675adb73862e
Auto-generated-cl: translation import
Matthew Fritze [Thu, 21 Jul 2016 01:24:02 +0000 (01:24 +0000)]
Merge \"Revert \"Revert \"Error colors to point to frameworks rather than hard-code them\"\"\" into nyc-mr1-dev
am:
9e7bd8de87
Change-Id: Ie9d9f4864c0e85375dace272cb9e389b3f02c573
Matthew Fritze [Thu, 21 Jul 2016 01:06:10 +0000 (01:06 +0000)]
Merge \"Revert \"Error colors to point to frameworks rather than hard-code them\"\" into nyc-mr1-dev
am:
22d09743d8
Change-Id: If9113aab011035227930b2df6b68341ee3774bd3
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:59:33 +0000 (00:59 +0000)]
Revert "Revert "Error colors to point to frameworks rather than hard-code them""
This reverts commit
7c11e933d540b27d596a1536ffbb75007e24a7e6.
Change-Id: I79ecbc39a78f17d22ec20097cfba213de5e30b5e
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks rather than hard-code them"" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:55:53 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks rather than hard-code them"
This reverts commit
43f762a0263b7da464c29c139fa6bfc91ec1713d.
Change-Id: If328c2e6983a2dd2295d83f17edbaaa3cc149b60
Chris Craik [Thu, 21 Jul 2016 00:39:44 +0000 (00:39 +0000)]
Merge \"Change swap chain stuffed detection logic\" into nyc-mr1-dev
am:
433a19e8bf
Change-Id: I6942a7cef5c831a1be3ee0252c2f475594f3db39
Amith Yamasani [Thu, 21 Jul 2016 00:30:26 +0000 (00:30 +0000)]
Merge \"Allow calling in demo mode\" into nyc-mr1-dev
am:
8c8d752851
Change-Id: I484fb7003f4a3f4ab967d19fc761973eb0c6c233
Chris Craik [Thu, 21 Jul 2016 00:26:14 +0000 (00:26 +0000)]
Merge "Change swap chain stuffed detection logic" into nyc-mr1-dev
Amith Yamasani [Thu, 21 Jul 2016 00:21:12 +0000 (00:21 +0000)]
Merge "Allow calling in demo mode" into nyc-mr1-dev
Matthew Fritze [Wed, 20 Jul 2016 23:47:23 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks rather than hard-code them\" into nyc-mr1-dev
am:
948400a43d
Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf
Chris Craik [Wed, 20 Jul 2016 00:59:12 +0000 (17:59 -0700)]
Change swap chain stuffed detection logic
bug:
29771461
bug:
29413700
bug:
30181577
Changes frame interval gap detection to look for wider gaps, as they
were incorrectly firing all the time.
Also adds a 500ms minimum gap between frames dropped because of stuffed
swap chain, to prevent dropping too often.
Change-Id: If16ed637d54bf37015704be102c5c2e3731a0824
Adrian Roos [Wed, 20 Jul 2016 23:41:14 +0000 (23:41 +0000)]
Merge \"Direct Reply: Allow closing IME separately from DirectReply mode\" into nyc-mr1-dev
am:
01acf40e0f
Change-Id: I0d38aca1c53c31e54819979eafd2f2dc37b2071a
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks rather than hard-code them" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:29:17 +0000 (23:29 +0000)]
Merge "Direct Reply: Allow closing IME separately from DirectReply mode" into nyc-mr1-dev
Doris Liu [Wed, 20 Jul 2016 23:15:43 +0000 (23:15 +0000)]
Merge \"Fix VD animator not being properly resumed\" into nyc-mr1-dev
am:
ffa880b83f
Change-Id: Ie10f5c12f528fb3d07765d724ee2a59138863906
Michael Kwan [Wed, 20 Jul 2016 23:15:33 +0000 (23:15 +0000)]
Merge \"Fix crash on devices with 1.2\" screens.\" into nyc-mr1-dev
am:
70a789f569
Change-Id: I18e99a65c5a8aeafe75f2a872ac39c8a4ac4f5a4
Doris Liu [Wed, 20 Jul 2016 23:10:52 +0000 (23:10 +0000)]
Merge "Fix VD animator not being properly resumed" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:09:55 +0000 (23:09 +0000)]
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
am:
b84ce2e034
Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
Chris Thornton [Wed, 20 Jul 2016 23:09:42 +0000 (23:09 +0000)]
Merge \"SoundTriggerHelpoer: Send pause events on abort if a model is running.\" into nyc-mr1-dev
am:
d661476c98
Change-Id: Ie470d782d3e16a440c345a444d4eb29cebec34b4
Michael Kwan [Wed, 20 Jul 2016 23:08:04 +0000 (23:08 +0000)]
Merge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:05:29 +0000 (23:05 +0000)]
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:05:20 +0000 (23:05 +0000)]
Merge "SoundTriggerHelpoer: Send pause events on abort if a model is running." into nyc-mr1-dev
Christopher Tate [Wed, 20 Jul 2016 22:58:03 +0000 (22:58 +0000)]
Merge \"Run the SELinux wallpaper restorecon operations on all users\" into nyc-mr1-dev
am:
bf9fa8280e
Change-Id: I06a8e2f5510f019f6c553a7b26ce602a690f9732
Chris Tate [Wed, 20 Jul 2016 22:45:10 +0000 (22:45 +0000)]
Merge "Run the SELinux wallpaper restorecon operations on all users" into nyc-mr1-dev
Bill Yi [Wed, 20 Jul 2016 22:23:45 +0000 (15:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibefe0963160a02bc49c36a2511d5c3f72f8078c2
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Jul 2016 22:18:26 +0000 (15:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8b102a4e41d6b25a88ae261313fc46f2781451e
Auto-generated-cl: translation import
Billy Lamberta [Wed, 20 Jul 2016 22:15:57 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am:
ef57498142
Change-Id: I6186c90e5d7125d678db5c876dc47697e14e60d7
Billy Lamberta [Wed, 20 Jul 2016 22:15:39 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am:
ef57498142
Change-Id: I8a874ca63bf3cbfa7c4abc3061f3cb8e19cd7486
Michael Kwan [Wed, 20 Jul 2016 22:12:02 +0000 (15:12 -0700)]
Fix crash on devices with 1.2" screens.
Bug:
30109315
Change-Id: Ia28f6dfcb833db966cc33ad289b5c7b5867b2407
Christopher Tate [Wed, 20 Jul 2016 22:10:18 +0000 (15:10 -0700)]
Run the SELinux wallpaper restorecon operations on all users
And only run them once per device boot lifetime.
Bug
30229410
Change-Id: Ia6f7f7eea7f8985c83b531dfa16e96d08235b901
Adam Lesinski [Wed, 20 Jul 2016 22:05:38 +0000 (22:05 +0000)]
Merge \"BatteryStats: Don\'t print empty platform idle state\" into nyc-mr1-dev
am:
ebbbead915
Change-Id: Ia651ad5a0a183ff7d70d90f119ec9238c15711ad
Adrian Roos [Mon, 18 Jul 2016 21:23:32 +0000 (14:23 -0700)]
Direct Reply: Allow closing IME separately from DirectReply mode
If the IME is showing, the first BACK now closes just
the IME instead of also closing the Direct Reply mode.
Subsequent back closes the notification panel as usual.
Change-Id: Ic4b5a4d6b528a211c2fa0c8b5ceb0f7017c09400
Fixes:
29996385
Billy Lamberta [Mon, 11 Jul 2016 20:13:56 +0000 (13:13 -0700)]
docs: work - Managed configuration bundles
Update 'Set up Managed Configurations' guide to include
examples for restriction bundles and bundle_arrays.
Include table for restriction entry types and usage.
Link to EMM doc for building DPC. Formatting.
bug:
26151150
bug:
29966701
Change-Id: I89f732709fadd511b968515ab16f07dd46195f0e
Adrian Roos [Wed, 20 Jul 2016 22:00:35 +0000 (22:00 +0000)]
Merge \"Direct Reply: Fix circular reveal origin\" into nyc-mr1-dev
am:
c50f8ae532
Change-Id: Ib3083e87f162a103acc6483b0f3367db73e1b269
Bill Yi [Wed, 20 Jul 2016 21:56:13 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e524908704b38120b77928886da6eda38ede052
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 20 Jul 2016 21:56:01 +0000 (21:56 +0000)]
Merge "BatteryStats: Don't print empty platform idle state" into nyc-mr1-dev
Bill Yi [Wed, 20 Jul 2016 21:53:17 +0000 (14:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5818fd932d01bc4ccfcd7204f013151604693bd3
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Jul 2016 21:50:29 +0000 (14:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife234bdea576401bd4d731fe0c7e1cd1f438275f
Auto-generated-cl: translation import
Adrian Roos [Wed, 20 Jul 2016 21:49:02 +0000 (21:49 +0000)]
Merge "Direct Reply: Fix circular reveal origin" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 21:21:18 +0000 (14:21 -0700)]
Support multiple intents in ShortcutInfo
Also fix b/
30230996.
TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().
Bug
30218829
Bug
30230996
Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f
Bill Yi [Wed, 20 Jul 2016 21:43:25 +0000 (14:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3cf276ba166a7e74f20c5434c88a0e290df6f934
Auto-generated-cl: translation import
Chris Thornton [Wed, 20 Jul 2016 01:56:15 +0000 (18:56 -0700)]
SoundTriggerHelpoer: Send pause events on abort if a model is running.
If the recognition was aborted due to the service state being set to
false, clients were not made aware that the model had been stopped (but
would get a resume event).
Bug:
30233664
Change-Id: I9f663362ff142eadfd5ef727c5f0c941f8e9e89d
Bill Yi [Wed, 20 Jul 2016 21:35:51 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7726a9e6e3fadac9a4949254a346717adbdc6217
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Jul 2016 21:28:07 +0000 (14:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50abd23a03da9d7e4ec9eca8cbdd49792dac4de9
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Jul 2016 21:25:22 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee373b82dc0979f6ef99f3d445b0ad336e6cc40a
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Jul 2016 21:22:29 +0000 (14:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc23d5d81d48870eb2553072773dc5cc4de90119
Auto-generated-cl: translation import
Ye Wen [Wed, 20 Jul 2016 21:22:05 +0000 (21:22 +0000)]
Merge \"Add carrier config for close connection after MMS request\" into nyc-mr1-dev
am:
f2598319c0
Change-Id: Ia16874474f755b601a02032e34b8dbff81971af8
Ye Wen [Wed, 20 Jul 2016 21:17:51 +0000 (21:17 +0000)]
Merge "Add carrier config for close connection after MMS request" into nyc-mr1-dev
Suprabh Shukla [Wed, 20 Jul 2016 21:01:09 +0000 (21:01 +0000)]
Merge \"Setting a system property when device goes into demo mode\" into nyc-mr1-dev
am:
24db3ab8b9
Change-Id: Iadedc063f7058a7d1f22e0151a8ebfc9a6a8dff1
Matthew Fritze [Tue, 19 Jul 2016 20:13:41 +0000 (13:13 -0700)]
Error colors to point to frameworks rather than hard-code them
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res.
Change-Id: Ia203ff6966cd58a3bc23eb883460f0f8abb050f5
Fixes:
30021554
TreeHugger Robot [Wed, 20 Jul 2016 20:52:45 +0000 (20:52 +0000)]
Merge "Setting a system property when device goes into demo mode" into nyc-mr1-dev
Julia Reynolds [Wed, 20 Jul 2016 20:45:13 +0000 (20:45 +0000)]
Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
am:
ae0aed951b
Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
Doris Liu [Wed, 20 Jul 2016 02:04:31 +0000 (19:04 -0700)]
Fix VD animator not being properly resumed
VectorDrawable animators remove themselves from RenderThread's
animator list when they detect their target not being in the
DisplayList. When the target got added back into DisplayList
without an invalidation(), the animators were not added to
the running animator list, therefore didn't continue to run.
This CL detects for the case where a VD is back in the DisplayList
and reactivate its animator.
BUG:
30101451
Change-Id: Ib5eb54af954a58a2fa617643bfcf5af40ce708a5
TreeHugger Robot [Wed, 20 Jul 2016 20:30:09 +0000 (20:30 +0000)]
Merge "Snooze schedule rules that were canceled by alarms." into nyc-mr1-dev
Felipe Leme [Wed, 20 Jul 2016 19:19:19 +0000 (19:19 +0000)]
Merge \"Improved storage size detection.\" into nyc-mr1-dev
am:
f0de4da42f
Change-Id: I9794d1d3e15177c88e49911e1b406433025e85c4
Bryan Mawhinney [Wed, 20 Jul 2016 19:13:04 +0000 (19:13 +0000)]
Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am:
881bc352ee
Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5
TreeHugger Robot [Wed, 20 Jul 2016 19:06:11 +0000 (19:06 +0000)]
Merge "Improved storage size detection." into nyc-mr1-dev
OSDN Git Service
