OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Aapt main dex proguard rules - always keep application"
Ivan Gavrilovic [Thu, 21 Jul 2016 09:03:00 +0000 (09:03 +0000)]
Merge "Aapt main dex proguard rules - always keep application"

8 years agoExifInterface: Add ORF file parse support
Jin Park [Thu, 14 Jul 2016 05:45:20 +0000 (14:45 +0900)]
ExifInterface: Add ORF file parse support

A ORF file has a unique way of storing its data. This CL adds code
that checks whether a file is a ORF file format and parses the data
according to specifications.

Bug: 29409358
Change-Id: I498408a9e02dfe567c2d427b037c30b06af74d7e

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c3264b01ed -s...
Bill Yi [Thu, 21 Jul 2016 04:13:00 +0000 (04:13 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c3264b01ed  -s ours
am: 63157a3b6e  -s ours

Change-Id: I52e26bf5c881a67547da4828ac19d2b4cfb30d77

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 04:02:06 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 28cb163056 -s...
Bill Yi [Thu, 21 Jul 2016 03:55:41 +0000 (03:55 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 28cb163056  -s ours
am: d6803f7eec  -s ours

Change-Id: If851a2131087c8a2199dc51f0ba4a8bce75fcc92

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 50fd9a9ca4 -s...
Bill Yi [Thu, 21 Jul 2016 03:55:38 +0000 (03:55 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 50fd9a9ca4  -s ours
am: f536f4989d  -s ours

Change-Id: I5331f5f50b3901b601ab0de53cf0d4c0b4166d96

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3638c9b330 -s...
Bill Yi [Thu, 21 Jul 2016 03:55:35 +0000 (03:55 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3638c9b330  -s ours
am: ffbdc55a1d  -s ours

Change-Id: I6e0abeb5cf3064d95bb562ac8cca5d5b944b6316

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: dfb24a204f -s...
Bill Yi [Thu, 21 Jul 2016 03:55:32 +0000 (03:55 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: dfb24a204f  -s ours
am: 74d10c0b14  -s ours

Change-Id: Ie3500be37250170ac803e80de5cfaf2976967e22

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 09af2a1032 -s...
Bill Yi [Thu, 21 Jul 2016 03:55:30 +0000 (03:55 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 09af2a1032  -s ours
am: 5ac71fee23  -s ours

Change-Id: Ib833f99b578d48c53ce481fc098e694cf8acc76d

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c1079364cb -s...
Bill Yi [Thu, 21 Jul 2016 03:48:17 +0000 (03:48 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c1079364cb  -s ours
am: 0a94845a7e  -s ours

Change-Id: Ie4030627ad6d4961f4479ee48b3efddcd828ae56

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 60858a45cd -s...
Bill Yi [Thu, 21 Jul 2016 03:48:12 +0000 (03:48 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 60858a45cd  -s ours
am: db8b36970c  -s ours

Change-Id: I14d90c58dc1d04ac5ffc48ec92e015dfeae37f3c

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: db89342ec6 -s...
Bill Yi [Thu, 21 Jul 2016 03:48:06 +0000 (03:48 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: db89342ec6  -s ours
am: dab3b245e0  -s ours

Change-Id: Id0bad6507d9b495bc4f29f1b5d0f6892bcdd5bd0

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: a9a03b5d7e -s...
Bill Yi [Thu, 21 Jul 2016 03:47:59 +0000 (03:47 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: a9a03b5d7e  -s ours
am: 71731a6d1a  -s ours

Change-Id: Ic2b521dc5a8f71bbdac12777253975fd4fdd3cce

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 98e71028c7 -s...
Bill Yi [Thu, 21 Jul 2016 03:47:53 +0000 (03:47 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 98e71028c7  -s ours
am: 059a43818b  -s ours

Change-Id: If3625bb70715da68be16a42bdc8116965039e0a0

8 years agoMerge \"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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:33:19 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "Remove unused "isTouchEvent" methods."
TreeHugger Robot [Thu, 21 Jul 2016 02:59:06 +0000 (02:59 +0000)]
Merge "Remove unused "isTouchEvent" methods."

8 years agoMerge "ExifInterface: Remove unnecessary logging of exceptions"
Jin Seok Park [Thu, 21 Jul 2016 02:43:47 +0000 (02:43 +0000)]
Merge "ExifInterface: Remove unnecessary logging of exceptions"

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge \\"Revert \\"Revert \\"Error colors to point to frameworks rather than hard...
Matthew Fritze [Thu, 21 Jul 2016 01:38:18 +0000 (01:38 +0000)]
Merge \\"Revert \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\"\\" into nyc-mr1-dev am: 9e7bd8de87
am: 250664a032

Change-Id: I07908d20c83232ef91b7c45cb772d066584c33a0

8 years agoMerge \\"Revert \\"Error colors to point to frameworks rather than hard-code them...
Andrew Sapperstein [Thu, 21 Jul 2016 01:37:38 +0000 (01:37 +0000)]
Merge \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\" into nyc-mr1-dev am: 22d09743d8
am: aa79a3c135

Change-Id: I53e9a848b90254c2bafd84342293265f7c6997b5

8 years agoExifInterface: Remove unnecessary logging of exceptions
Jin Park [Thu, 21 Jul 2016 01:27:57 +0000 (10:27 +0900)]
ExifInterface: Remove unnecessary logging of exceptions

ExifInterface currently logs exceptions when it encounters invalid
markers and when the file format is unsupported by Piex Library.
This CL suppresses such logs with the DEBUG marker.

Bug: 30252745
Change-Id: Ia69183eaa5bf7ac2ff1dc95c0919b23b4a9f8c4e

8 years agoMerge \"Revert \"Revert \"Error colors to point to frameworks rather than hard-code...
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

8 years agoMerge \"Revert \"Error colors to point to frameworks rather than hard-code them\...
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

8 years agoMerge "Revert "Revert "Error colors to point to frameworks rather than hard-code...
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

8 years agoMerge \\"Change swap chain stuffed detection logic\\" into nyc-mr1-dev am: 433a19e8bf
Chris Craik [Thu, 21 Jul 2016 00:59:49 +0000 (00:59 +0000)]
Merge \\"Change swap chain stuffed detection logic\\" into nyc-mr1-dev am: 433a19e8bf
am: 3c37412900

Change-Id: Id7e0d1d1dfb5448dd927c29361fb98aabf0cfe10

8 years agoMerge \\"Allow calling in demo mode\\" into nyc-mr1-dev am: 8c8d752851
Amith Yamasani [Thu, 21 Jul 2016 00:59:45 +0000 (00:59 +0000)]
Merge \\"Allow calling in demo mode\\" into nyc-mr1-dev am: 8c8d752851
am: 1230bfc9c7

Change-Id: I87565cc57a39e85ec769ba325cfb7e1590c6b7f5

8 years agoRevert "Revert "Error colors to point to frameworks rather than hard-code them""
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

8 years agoMerge \\"Error colors to point to frameworks rather than hard-code them\\" into nyc...
Matthew Fritze [Thu, 21 Jul 2016 00:59:28 +0000 (00:59 +0000)]
Merge \\"Error colors to point to frameworks rather than hard-code them\\" into nyc-mr1-dev am: 948400a43d
am: 85d688cd79

Change-Id: I214563e1cd9ad44c99ea34c5480bc7ab1814a975

8 years agoMerge "Revert "Error colors to point to frameworks rather than hard-code them"" into...
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

8 years agoRevert "Error colors to point to frameworks rather than hard-code them"
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

8 years agoMerge "MediaExtractor: Javadoc should mention INTERNET permission"
Robert Shih [Thu, 21 Jul 2016 00:53:12 +0000 (00:53 +0000)]
Merge "MediaExtractor: Javadoc should mention INTERNET permission"

8 years agoMediaExtractor: Javadoc should mention INTERNET permission
Robert Shih [Thu, 21 Jul 2016 00:45:27 +0000 (17:45 -0700)]
MediaExtractor: Javadoc should mention INTERNET permission

Bug: 10673034
Change-Id: Iea1196c76b09fa5b8f5b2d11a461eeb4c6578a1b

8 years agoMerge \"Change swap chain stuffed detection logic\" into nyc-mr1-dev
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

8 years agoMerge \"Allow calling in demo mode\" into nyc-mr1-dev
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

8 years agoMerge "Change swap chain stuffed detection logic" into nyc-mr1-dev
Chris Craik [Thu, 21 Jul 2016 00:26:14 +0000 (00:26 +0000)]
Merge "Change swap chain stuffed detection logic" into nyc-mr1-dev

8 years agoMerge "Allow calling in demo mode" 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

8 years agoMerge \"Error colors to point to frameworks rather than hard-code them\" into nyc...
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

8 years agoChange swap chain stuffed detection logic
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

8 years agoMerge \\"Direct Reply: Allow closing IME separately from DirectReply mode\\" into...
Adrian Roos [Wed, 20 Jul 2016 23:46:42 +0000 (23:46 +0000)]
Merge \\"Direct Reply: Allow closing IME separately from DirectReply mode\\" into nyc-mr1-dev am: 01acf40e0f
am: 96b91f692b

Change-Id: I0e105bd5e0d9d8a3d879bc62d5942c4be38ff595

8 years agoMerge \"Direct Reply: Allow closing IME separately from DirectReply mode\" into nyc...
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

8 years agoMerge "Error colors to point to frameworks rather than hard-code them" into nyc-mr1-dev
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

8 years agoMerge "Direct Reply: Allow closing IME separately from DirectReply mode" into nyc...
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

8 years agoMerge \\"Fix VD animator not being properly resumed\\" into nyc-mr1-dev am: ffa880b83f
Doris Liu [Wed, 20 Jul 2016 23:22:03 +0000 (23:22 +0000)]
Merge \\"Fix VD animator not being properly resumed\\" into nyc-mr1-dev am: ffa880b83f
am: ea01b159b7

Change-Id: I72661874e79e48b121030a6abce849a2a319cc36

8 years agoMerge \\"Fix crash on devices with 1.2\\" screens.\\" into nyc-mr1-dev am: 70a789f569
Michael Kwan [Wed, 20 Jul 2016 23:22:00 +0000 (23:22 +0000)]
Merge \\"Fix crash on devices with 1.2\\" screens.\\" into nyc-mr1-dev am: 70a789f569
am: c170ce9ca4

Change-Id: I5b191acddf66ada9df6ccd43fb514b9b7070d15e

8 years agoMerge \"Fix VD animator not being properly resumed\" 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

8 years agoMerge \"Fix crash on devices with 1.2\" screens.\" into nyc-mr1-dev
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

8 years agoMerge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am: b84ce2e034
Makoto Onuki [Wed, 20 Jul 2016 23:15:32 +0000 (23:15 +0000)]
Merge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am: b84ce2e034
am: 9a6109f284

Change-Id: I0f1caf54cc544db0b73f8e3275005923904f57a8

8 years agoMerge \\"SoundTriggerHelpoer: Send pause events on abort if a model is running.\...
Chris Thornton [Wed, 20 Jul 2016 23:15:22 +0000 (23:15 +0000)]
Merge \\"SoundTriggerHelpoer: Send pause events on abort if a model is running.\\" into nyc-mr1-dev am: d661476c98
am: c0bcb77315

Change-Id: Icda8c384b6c1100881d9cb800b2f39d25d09c800

8 years agoMerge "Fix VD animator not being properly resumed" into nyc-mr1-dev
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

8 years agoMerge \"Support multiple intents in ShortcutInfo\" 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

8 years agoMerge \"SoundTriggerHelpoer: Send pause events on abort if a model is running.\"...
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

8 years agoMerge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev
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

8 years agoMerge "Support multiple intents in ShortcutInfo" 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

8 years agoMerge "SoundTriggerHelpoer: Send pause events on abort if a model is running." into...
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

8 years agoMerge \\"Run the SELinux wallpaper restorecon operations on all users\\" into nyc...
Chris Tate [Wed, 20 Jul 2016 23:04:29 +0000 (23:04 +0000)]
Merge \\"Run the SELinux wallpaper restorecon operations on all users\\" into nyc-mr1-dev am: bf9fa8280e
am: 7ce8cfbec4

Change-Id: I8e5e20a2a9b21ec6a704aa9c7abb3a0ef1878d12

8 years agoMerge \"Run the SELinux wallpaper restorecon operations on all users\" 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

8 years agoRemove unused "isTouchEvent" methods.
Steve McKay [Tue, 19 Jul 2016 20:24:23 +0000 (13:24 -0700)]
Remove unused "isTouchEvent" methods.

Update BandController to use InputEvent not contrete MotionInputEvent.

Change-Id: I47a7558d8dcebfa6c44dc9a62741487422bf0ff7

8 years agoMerge "Run the SELinux wallpaper restorecon operations on all users" into nyc-mr1-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoFix crash on devices with 1.2" screens.
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

8 years agoMerge \\"BatteryStats: Don\\'t print empty platform idle state\\" into nyc-mr1-dev...
Adam Lesinski [Wed, 20 Jul 2016 22:10:44 +0000 (22:10 +0000)]
Merge \\"BatteryStats: Don\\'t print empty platform idle state\\" into nyc-mr1-dev am: ebbbead915
am: 7da697a79f

Change-Id: I644c302cc1cbea8b2387d9ac591845b7c43cc5c0

8 years agoRun the SELinux wallpaper restorecon operations on all users
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

8 years agoMerge \\"Direct Reply: Fix circular reveal origin\\" into nyc-mr1-dev am: c50f8ae532
Adrian Roos [Wed, 20 Jul 2016 22:05:43 +0000 (22:05 +0000)]
Merge \\"Direct Reply: Fix circular reveal origin\\" into nyc-mr1-dev am: c50f8ae532
am: 2a7f27180d

Change-Id: I83186a86c1222170e93e90e2f752f2751f206d05

8 years agoMerge \"BatteryStats: Don\'t print empty platform idle state\" into nyc-mr1-dev
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

8 years agoDirect Reply: Allow closing IME separately from DirectReply mode
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

8 years agoMerge \"Direct Reply: Fix circular reveal origin\" into nyc-mr1-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "BatteryStats: Don't print empty platform idle state" into nyc-mr1-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Direct Reply: Fix circular reveal origin" into nyc-mr1-dev
Adrian Roos [Wed, 20 Jul 2016 21:49:02 +0000 (21:49 +0000)]
Merge "Direct Reply: Fix circular reveal origin" into nyc-mr1-dev

8 years agoSupport multiple intents in ShortcutInfo
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoSoundTriggerHelpoer: Send pause events on abort if a model is running.
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge \\"Add carrier config for close connection after MMS request\\" into nyc-mr1...
Ye Wen [Wed, 20 Jul 2016 21:28:12 +0000 (21:28 +0000)]
Merge \\"Add carrier config for close connection after MMS request\\" into nyc-mr1-dev am: f2598319c0
am: 2395da5e82

Change-Id: Ia6a5877bf5ca52cf65b2ee7a85642a00b208428f

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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