Paul McLean
aa6f7b50f3
am 04156f72: Merge "Fix ALSA initialized wait for input-only USB Audio devices" into lmp-dev
...
* commit '04156f723709a2e45e1eec0f93b898ef98faaec2':
Fix ALSA initialized wait for input-only USB Audio devices
2014-08-14 20:20:23 +00:00
Adam Powell
f22d007895
am 7622c178: Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev
...
* commit '7622c178b3c218bedd930f0103673794b6fe8386':
Show checkmarks at the start of material AlertDialog list items
2014-08-14 20:20:18 +00:00
Alan Viverette
2b2bac7689
am 5c9feadd: Merge "Make sure we\'re obtaining themed drawables correctly" into lmp-dev
...
* commit '5c9feadd16ce010b0bf34bf23bee92421888255c':
Make sure we're obtaining themed drawables correctly
2014-08-14 20:12:22 +00:00
Jason Monk
f2625671a1
am eb9daa91: Merge "Switch exiting screen pinning to recents+back" into lmp-dev
...
* commit 'eb9daa91fe4b6c4142d65b2becc6247345c17c74':
Switch exiting screen pinning to recents+back
2014-08-14 20:12:17 +00:00
Alan Viverette
bf64d2cfee
am e4ac85c2: Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev
...
* commit 'e4ac85c2b79a15adee1523569f03b2b1f2e55b79':
Prevent SwitchPreference widget from receiving a11y focus
2014-08-14 20:12:11 +00:00
Alan Viverette
c0e64ce22a
am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration()
...
* commit 'f150fb344282a6e38284153298ea737c64626f19':
Deprecate InputMethodService.enableHardwareAcceleration()
2014-08-14 20:12:04 +00:00
Alan Viverette
a02e76df19
am 056941f1: Merge "Don\'t set textColor in button style" into lmp-dev
...
* commit '056941f1347d3e993d95770eff8277d57dd8e538':
Don't set textColor in button style
2014-08-14 20:11:59 +00:00
Anish Athalye
878f087360
am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev
...
* commit '2f2e37979903a6ed0d55dee78864c2cbb9fb9d7e':
Make LeadingMarginSpan2 behavior more consistent
2014-08-14 20:07:39 +00:00
Alan Viverette
e07b595519
Deprecate InputMethodService.enableHardwareAcceleration()
...
BUG: 16951553
Change-Id: I126ea823eb2eeabb29d30999dec9c9411b33b315
2014-08-14 20:06:02 +00:00
Jorim Jaggi
7644f6e977
am dd26d8b2: Fix listening states for two-finger and fast-double swipe
...
* commit 'dd26d8b2efe5a1e9f8951e21919a1efa781450f2':
Fix listening states for two-finger and fast-double swipe
2014-08-14 20:03:23 +00:00
Jorim Jaggi
8599a33580
Fix listening states for two-finger and fast-double swipe
...
Bug: 16655660
Change-Id: I46d826edc901e08eb1513fe87de2f63228581617
2014-08-14 19:55:42 +00:00
Anish Athalye
4798c44563
Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev
2014-08-14 19:49:28 +00:00
Jason Monk
92117e9b0c
Merge "Switch exiting screen pinning to recents+back" into lmp-dev
2014-08-14 19:41:44 +00:00
Jason Monk
815e057b9b
Switch exiting screen pinning to recents+back
...
When accessibility is on, still use just recents.
While here fix strings to be less wrong. Still need finalization.
Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
2014-08-14 20:06:41 +00:00
Alan Viverette
b7bd357cb8
Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev
2014-08-14 19:41:44 +00:00
Alan Viverette
0464ca04e8
Prevent SwitchPreference widget from receiving a11y focus
...
Has no effect on behavior when explore by touch is turned off.
BUG: 16961152
Change-Id: I1e494d6a86f261d22d551afc43fe9e499907df6f
2014-08-14 20:00:04 +00:00
Jorim Jaggi
a4841c44bf
am 1550dd96: Don\'t scale notifications on Keyguard for devices < xxhdpi
...
* commit '1550dd966ef7a37b1861d540692ad65fe1f92215':
Don't scale notifications on Keyguard for devices < xxhdpi
2014-08-14 19:22:21 +00:00
Jorim Jaggi
704cbffcc0
am 7bcbac87: Merge "Disable DragDownHelper in QS" into lmp-dev
...
* commit '7bcbac87b73d34a9e5b809f423ee6ba168276c6e':
Disable DragDownHelper in QS
2014-08-14 19:22:08 +00:00
Dan Sandler
c53da1fb58
am c514a213: No need for drawing caches on notifications.
...
* commit 'c514a213de53d42b2e668e2c5668324932fd0f38':
No need for drawing caches on notifications.
2014-08-14 19:18:03 +00:00
Jorim Jaggi
d7c1fae12e
Don't scale notifications on Keyguard for devices < xxhdpi
...
Bug: 16824061
Change-Id: Iccccebcd17357764aef325df0cd220508fcf7403
2014-08-14 19:16:33 +00:00
Anish Athalye
ab08c6d38a
Make LeadingMarginSpan2 behavior more consistent
...
This addresses b/16486549.
This change updates public documentation to specify the behavior of
LeadingMarginSpan2s. This change specifies what happens when a
LeadingMarginSpan2 is combined with other LeadingMarginSpans. This
behavior was not previously documented.
LeadingMarginSpan2s specify the number of lines used for the leading
margin. When laying out and rendering, for all LeadingMarginSpans, the
first line margin is applied for the number of lines specified by the
LeadingMarginSpan2.
Previously, this behavior was slightly buggy -- the LeadingMarginSpan2
affected all LeadingMarginSpans when laying out text, but not when
rendering.
This change is designed to cause the least amount of breakage in
existing code while achieving consistency with the way
LeadingMarginSpan2 is handled in layout and drawing.
For the most common use of LeadingMarginSpan2 -- getting a multi-line
first margin in the first paragraph of text in a layout -- this should
cause no change in behavior. For any other uses, the old (buggy)
implementation most likely did not exhibit correct behavior to begin
with, so developers were most likely not relying on that functionality.
Change-Id: I6f69df09c0130e703458e65bf3eaac4a905df56e
2014-08-14 11:58:37 -07:00
Dan Sandler
b120ac5b69
No need for drawing caches on notifications.
...
They just chew up memory.
Bug: 10918599
Change-Id: I99761846e88b7ea25270d7a70d118963b1d72e5f
2014-08-14 18:52:30 +00:00
Adrian Roos
48fe9e440b
am cdc67b67: Label user switcher button for accessibility
...
* commit 'cdc67b67f0b1381ff13c7df45acd55b25373c586':
Label user switcher button for accessibility
2014-08-14 18:43:46 +00:00
Adrian Roos
1de02ee3ea
Label user switcher button for accessibility
...
Bug: 15692931
Change-Id: I4add4c21fd0ed95cc3a49e2841173589f37db08a
2014-08-14 18:39:15 +00:00
RoboErik
085d6f7693
am bc0d11a6: Merge "Pipe caller\'s identity through volume methods" into lmp-dev
...
* commit 'bc0d11a69e8de61fec1698c33dd2a30be952fbdd':
Pipe caller's identity through volume methods
2014-08-14 18:13:30 +00:00
Fabrice Di Meglio
1d615fbf2c
am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered
...
* commit '25c2863ef72dc3044d68c6b58a54f6b67b9d918b':
Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
2014-08-14 18:04:32 +00:00
Winson Chung
11f359041e
am 91f8e91e: Merge "Anchoring the front most task to make the dismiss animation more stable. (Bug 16939699)" into lmp-dev
...
* commit '91f8e91ea32e4456b0c216f6300f867386959a46':
Anchoring the front most task to make the dismiss animation more stable. (Bug 16939699)
2014-08-14 18:04:28 +00:00
Fabrice Di Meglio
b1a50f2dff
Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings.
...
SettingsPreferenceFragment$1@273c8fdb was not registered
- add onUnbindPreferences() call to match onBindPreferences()
- this new method is @hide so it does not impact the APIs
Change-Id: Iee0ab8a4ecc2046f89fb96cc52af150e835f658c
2014-08-14 18:00:11 +00:00
Jae Seo
d72c0c4ccb
am 8b6c899b: Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
...
* commit '8b6c899b77e831285f504f17e29849f084c1c329':
TIF: fix IOException at PersistentDataStore.save()
2014-08-14 17:44:06 +00:00
Jae Seo
7b7ce1586e
am 5152ff49: Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev
...
* commit '5152ff49dad6517759902ecdc00479af36ea3808':
TIF: Rename R.attr.contentRatingSystemXml and fix documentation
2014-08-14 17:39:25 +00:00
Amit Mahajan
d640839ff6
am cb8fce42: Merge "Revert "Revert "add apn setting parameters, and set apn parameters to bp""" into lmp-dev
...
* commit 'cb8fce42d218b191b3b6911d6218f49933ef9ba2':
Revert "Revert "add apn setting parameters, and set apn parameters to bp""
2014-08-14 17:39:19 +00:00
RoboErik
5a97e61103
am cf7e33d3: Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev
...
* commit 'cf7e33d3c6cc800b11fc40b847db42bc34410b1d':
Remove REMOTE_STREAM_MUSIC references from AudioService
2014-08-14 17:39:14 +00:00
Selim Cinek
42c4f9269a
am b75adcf0: Merge "Fixed a NPE during setup wizard" into lmp-dev
...
* commit 'b75adcf03b56d8c81231cc9f1734661539bf912c':
Fixed a NPE during setup wizard
2014-08-14 17:34:51 +00:00
RoboErik
98085abc71
am 9d006c55: Merge "Post MediaSessionManager callbacks to the caller\'s thread" into lmp-dev
...
* commit '9d006c55a1d1750dba2f648aa680c3a8634a0bd8':
Post MediaSessionManager callbacks to the caller's thread
2014-08-14 17:16:46 +00:00
RoboErik
084bed4d73
am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
...
* commit 'b11490fb8f300e1f44223b03f20f7efa943d573b':
Add an onSessionDestroyed callback to MediaController.Callback
2014-08-14 17:09:01 +00:00
RoboErik
985ab5fbe5
am 098e4e09: Merge "Fix dates on copywrite in new test code" into lmp-dev
...
* commit '098e4e09a0a9320fb9121e6d5596efdbadd2ac0d':
Fix dates on copywrite in new test code
2014-08-14 17:08:56 +00:00
Jose Lima
406e4333f2
am bd2f1793: Make TranslucentConversionListener a SystemApi
...
* commit 'bd2f17932b96cad3f070a5078290f70cb1f387f4':
Make TranslucentConversionListener a SystemApi
2014-08-14 17:04:43 +00:00
Adam Powell
21dbab14f4
Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev
2014-08-14 16:46:52 +00:00
Adam Powell
16f2b90d6a
Show checkmarks at the start of material AlertDialog list items
...
Also fix a bug in parsing CheckedTextView tinting attributes
Bug 16552638
Change-Id: I20d41b6f6d418fdc115108d31f4f463e371794d2
2014-08-14 13:11:12 -07:00
Jae Seo
82324ec662
Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
2014-08-14 16:46:52 +00:00
Wonsik Kim
7ed8901f12
TIF: fix IOException at PersistentDataStore.save()
...
Bug: 17018435
Change-Id: Ic999aaf59ae942ee8279576ec1e2ce2fa62bd6e0
2014-08-14 10:06:12 -07:00
RoboErik
5ca4a78e32
Merge "Post MediaSessionManager callbacks to the caller's thread" into lmp-dev
2014-08-14 16:46:52 +00:00
Torne (Richard Coles)
5ae4446993
am ca6c7cb1: Merge "Store the WebView\'s package info." into lmp-dev
...
* commit 'ca6c7cb19131de999bab89b524b0d09fdb8a6951':
Store the WebView's package info.
2014-08-14 16:17:15 +00:00
Jose Lima
14914858a0
Make TranslucentConversionListener a SystemApi
...
Change-Id: I59a93e1e040fdbaa9ef108b31e08e4553ba82ae1
2014-08-14 09:15:17 -07:00
RoboErik
b05ea7bb28
Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
2014-08-14 16:10:21 +00:00
RoboErik
e7ba237ce4
Merge "Fix dates on copywrite in new test code" into lmp-dev
2014-08-14 16:10:21 +00:00
Jeff Sharkey
9da0bb60e4
am 67ec007c: Fix javadoc on PROTECTION_FLAG_APPOP.
...
* commit '67ec007c8e2fabe19ae1ad9bf369ccede4c96d54':
Fix javadoc on PROTECTION_FLAG_APPOP.
2014-08-14 16:08:45 +00:00
Jeff Sharkey
e9b78fdbbe
Fix javadoc on PROTECTION_FLAG_APPOP.
...
Change-Id: I36e339ac2c6e6842441fd2572b0b8cda24bd34ca
2014-08-14 16:01:37 +00:00
Doug Zongker
5b101a7c45
am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev
...
* commit '2b13359aa8b7deb2cf4c46f0673159fe4d8bfa22':
@hide RECOVERY permission
2014-08-14 14:29:58 +00:00
Adrian Roos
b870d1f433
am af71a2db: Merge "Add content description for brightness slider" into lmp-dev
...
* commit 'af71a2db633fac49228b613c5c1b1c4101bb9f36':
Add content description for brightness slider
2014-08-14 14:17:51 +00:00