John Spurlock
68fdbd0179
am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev
...
* commit 'a0adb0bd46389b7ac0474b7727cdbdb36d0d48a0':
Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
2014-10-31 00:28:28 +00:00
Alan Viverette
71c2789930
am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev
...
* commit 'e9e7d012dd7df56227854fd0887b6f0476db8b67':
Ensure we don't pass null values in to Theme.resolveAttributes
2014-10-31 00:28:11 +00:00
Ricardo Cervera
067cbe7f46
am 9a0e242c: am 44e79cc5: am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
...
* commit '9a0e242c84bae5f41a8fde8c5398f8eebd1a5b02':
docs: Two-page notification fix.
2014-10-31 00:26:29 +00:00
Jorim Jaggi
9653686338
am 15962f1d: am 196edbc9: am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev
...
* commit '15962f1da5803523a51a9c3f29315d566c708f66':
Make status bar expanding more tightly coupled to finger
2014-10-31 00:26:24 +00:00
Jorim Jaggi
256d57944e
am 0b2c319f: am 37651a8b: am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev
...
* commit '0b2c319f4c6cf4c3bce3026d2ef7f051e8f2d4e2':
Follow up to I495ce480c25de24b6433adebdfe923b637d98f66
2014-10-31 00:26:20 +00:00
Lorenzo Colitti
27b2383306
am 58d86a5c: am 1a9864db: am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev
...
* commit '58d86a5c2af1cc7f57e6042a91f155b7c5ab230d':
Enable 464xlat on wifi.
2014-10-31 00:26:16 +00:00
Lorenzo Colitti
3d62297e85
am fa186dbd: am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
...
* commit 'fa186dbd3dce56dfc209b7c10a3bc66e7036055d':
Add support for running 464xlat on wifi as well.
2014-10-31 00:26:10 +00:00
Nicolas Prevot
b59378d74b
am da0611a7: am ad93adfb: am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev
...
* commit 'da0611a759d9b5cc4a5cb5278c1fd0cdd1641812':
Schedule to write package restrictions.
2014-10-31 00:26:05 +00:00
Chris Banes
8094de110e
am 3726cd12: am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
...
* commit '3726cd1285032baa9810c81fa99cdb6dc082ceac':
Fix ActionMenuView vertical alignment of items
2014-10-31 00:26:00 +00:00
Dongwon Kang
b6f66b4055
am c86090ea: am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d
...
* commit 'c86090ea0ca6c9deaecd366d183d98ded71bd25b':
TIF: handle inputs holding the overlay view even after the session release
2014-10-31 00:25:56 +00:00
Dongwon Kang
7c1f55e6d3
am 27219325: am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev
...
* commit '27219325d5e83ad4c63ba3424fd99b24456b558a':
TIF: Handle notifyXXX() calls requested before the session initialization
2014-10-31 00:25:51 +00:00
Yigit Boyar
e905d36dcb
am 9d0a2dc1: am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
...
* commit '9d0a2dc15daebc448f239e5b968bf272dde7924e':
Move all actionbar related methods to DecorToolbar
2014-10-31 00:25:47 +00:00
Alan Viverette
8fae7382b9
am af896cc7: am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev
...
* commit 'af896cc719bd0e393f6050598570a34d3b29b6be':
Ensure ImageView.setImageResource() always resolves Drawable
2014-10-31 00:25:42 +00:00
Alan Viverette
f2ae40739a
am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
...
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
Distinguish unspecified and explicit null values in resources
2014-10-31 00:25:37 +00:00
Alan Viverette
2929579d20
am 370403db: am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev
...
* commit '370403dbdec3a1d769c31aca66e5fcbd6617c897':
Add theme and config change support to more Drawable types
2014-10-31 00:25:33 +00:00
Alan Viverette
5d53065849
am 349e93ea: am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
...
* commit '349e93ea651b9153b7f7127c4f489a11df51b3aa':
Show scroll indicators in AlertDialog
2014-10-31 00:25:28 +00:00
kmccormick
450e8b55b4
am 8909977b: (-s ours) am 30c27afc: am f769c981: am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
...
* commit '8909977bd1adba9c0e6b3e7c30243f79b96594f7':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-31 00:25:23 +00:00
kmccormick
26736a3cf3
am fa0af98f: am d61ce7db: am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit 'fa0af98f1b13916513ecd5497241185e6d74977f':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-31 00:25:19 +00:00
Adam Lesinski
b8b49f3084
am 5231a1ed: am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev
...
* commit '5231a1edf4808e181daf3bfeaef5a10453929498':
Add dumpsys output to UsageStatsService, along with --checkin support
2014-10-31 00:25:13 +00:00
Wale Ogunwale
4147cbd4df
am 75b1e8c5: am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev
...
* commit '75b1e8c5c6c8a76ae02c68679156b5c92b1a68af':
Fix issue 6455374: Bad recent image on camera launch from lockscreen.
2014-10-31 00:25:08 +00:00
Eric Laurent
d51558cd2a
am c27169e0: am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev
...
* commit 'c27169e0d21f10771ca541fdc965d009ca4dc240':
SoundTrigger JNI: fix local reference leak.
2014-10-31 00:25:03 +00:00
Jean-Michel Trivi
8fdb0d4def
More AudioPolicy registration
...
Define new usage in AudioAttributes to describe "virtual" sources.
Maintain a registration string in AudioPolicy and AudioMix that
is used for the address of the mix in the native policy manager.
AudioPolicy registration marks the audio policy configuration and
the audio mixes as registered.
The AudioPolicy class is used as the factory for the AudioTrack
and AudioRecord objects that are respectively used as the
source and sink of the mixes created by the policy owner.
Bug 16009464
Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
2014-10-30 17:22:34 -07:00
Ricardo Cervera
9a0e242c84
am 44e79cc5: am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
...
* commit '44e79cc59ab32f37e3e0c91046e01e47c24fc1e6':
docs: Two-page notification fix.
2014-10-31 00:16:38 +00:00
Jorim Jaggi
15962f1da5
am 196edbc9: am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev
...
* commit '196edbc9f650d1840116e625092b8e9f5727806f':
Make status bar expanding more tightly coupled to finger
2014-10-31 00:16:29 +00:00
Jorim Jaggi
0b2c319f4c
am 37651a8b: am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev
...
* commit '37651a8baa1405a8b53b41f8c75d75fa3d760956':
Follow up to I495ce480c25de24b6433adebdfe923b637d98f66
2014-10-31 00:16:20 +00:00
Lorenzo Colitti
58d86a5c2a
am 1a9864db: am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev
...
* commit '1a9864db0af701074d9060f8eef8189e108485be':
Enable 464xlat on wifi.
2014-10-31 00:16:14 +00:00
Lorenzo Colitti
fa186dbd3d
am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
...
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
Add support for running 464xlat on wifi as well.
2014-10-31 00:16:09 +00:00
Nicolas Prevot
da0611a759
am ad93adfb: am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev
...
* commit 'ad93adfb3d4b5470098ec82ea320b9e3669abddb':
Schedule to write package restrictions.
2014-10-31 00:15:55 +00:00
Chris Banes
3726cd1285
am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
...
* commit '95e3322c93fbfa4806f5ec0c63478854b4b29396':
Fix ActionMenuView vertical alignment of items
2014-10-31 00:15:48 +00:00
Dongwon Kang
c86090ea0c
am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d
...
* commit 'c78d450b2ecc4668572ef6b312ff0d9d31cfd2f8':
TIF: handle inputs holding the overlay view even after the session release
2014-10-31 00:15:40 +00:00
Dongwon Kang
27219325d5
am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev
...
* commit '39567dd6480ae2527af8f53199e0f42e1de80b2c':
TIF: Handle notifyXXX() calls requested before the session initialization
2014-10-31 00:15:33 +00:00
Yigit Boyar
9d0a2dc15d
am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
...
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
Move all actionbar related methods to DecorToolbar
2014-10-31 00:15:16 +00:00
Alan Viverette
af896cc719
am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev
...
* commit 'ce0bc26443bb61832ac59a0d367b9ec1a540301b':
Ensure ImageView.setImageResource() always resolves Drawable
2014-10-31 00:15:09 +00:00
Alan Viverette
9a77c8a279
am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
...
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
Distinguish unspecified and explicit null values in resources
2014-10-31 00:15:01 +00:00
Alan Viverette
370403dbde
am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev
...
* commit '07a08010a87daec2091b643a8fcf2f7a27588098':
Add theme and config change support to more Drawable types
2014-10-31 00:14:51 +00:00
Alan Viverette
349e93ea65
am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
...
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
Show scroll indicators in AlertDialog
2014-10-31 00:14:38 +00:00
kmccormick
8909977bd1
am 30c27afc: am f769c981: am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
...
* commit '30c27afcc79ac574ab4dd8a8341ebd9e26b5ada3':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-31 00:14:29 +00:00
kmccormick
fa0af98f1b
am d61ce7db: am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit 'd61ce7db43015fde515d85fe6c7a424030f8c8d3':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-31 00:14:23 +00:00
Adam Lesinski
5231a1edf4
am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev
...
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
Add dumpsys output to UsageStatsService, along with --checkin support
2014-10-31 00:13:47 +00:00
Wale Ogunwale
75b1e8c5c6
am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev
...
* commit '0319e704c19deeea7cd8c93a6275ac02e565b473':
Fix issue 6455374: Bad recent image on camera launch from lockscreen.
2014-10-31 00:13:36 +00:00
Eric Laurent
c27169e0d2
am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev
...
* commit '96c39e4c891b4fa296fe5d6e8d5a323ecd77d84f':
SoundTrigger JNI: fix local reference leak.
2014-10-31 00:13:30 +00:00
Alan Viverette
14d3b42d5a
am c2663dfd: am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev
...
* commit 'c2663dfdab293c233e230f637b8aaf4bc79bf8d0':
Update drawable state after updating tint list
2014-10-31 00:01:33 +00:00
Svetoslav
840e230d4e
am 65895fac: am 39f35336: am d3786a59: Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev
...
* commit '65895facf2b7c4d31bd8dbd0132e1471b381f0d8':
Print preview disappearing if printer is changed.
2014-10-31 00:01:28 +00:00
Alan Viverette
9b0ac44b41
am b50a6f39: am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
...
* commit 'b50a6f39ca8bafee342852de50029077be47334f':
Add setters for window elevation and clipToOutline properties
2014-10-31 00:01:21 +00:00
Alan Viverette
d99cbd96a6
am aff329f8: am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
...
* commit 'aff329f867ef06f8caf86b60da2a14e7cec2f2bb':
Ensure accessibility focus rect is drawn correctly
2014-10-31 00:01:16 +00:00
Alan Viverette
843f1c1926
am 136974c0: am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
...
* commit '136974c0668b05e9951f6f8c748d6cc42633eb39':
Create translucent hardware renderer if surface insets are non-zero
2014-10-31 00:01:11 +00:00
Dianne Hackborn
2e17445e96
am 92faa96a: am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
...
* commit '92faa96a26728370b2e3d002a83482e7345bfd0c':
Condense AndroidRuntime init log, include uid running under.
2014-10-31 00:01:06 +00:00
Tom Taylor
fe388319ab
am d034f1a3: am b281c068: am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
...
* commit 'd034f1a3d4add05970f7801abb4645d9f84abc16':
Add a missing mms_config constant to SmsManager
2014-10-31 00:01:02 +00:00
Jeff Hao
ab3ff04d52
am 05ea3213: am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
...
* commit '05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17':
Change boot screen title to "Android is starting" when not upgrading.
2014-10-31 00:00:57 +00:00
Tyler Gunn
018780687c
am 2a369533: am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
...
* commit '2a369533947c5552ba8e1c5cc9fb657952e3f0e0':
Communicating participant changes to conference controller.
2014-10-31 00:00:52 +00:00