Alan Viverette
4bcd4a14e6
am bfc8599f: am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
...
* commit 'bfc8599f43971fc11a7d1e67e557a83b3d476609':
Use action mode context for ActionMode menu inflater
2014-10-31 00:00:48 +00:00
Vladimir Marko
eca0b1ceb8
am 54076d72: am 0904509f: am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
...
* commit '54076d72f7256703974145c4009763999d4f29b1':
Fix android_media_AudioSystem_getMasterMute return type.
2014-10-31 00:00:44 +00:00
Chris Wren
80baea4460
am 04a14e59: am 7837294b: am 755f4021: fix build break from mis-named DEBUG flag in SystemUI
...
* commit '04a14e599e79e3453971ae3307948da5935775ff':
fix build break from mis-named DEBUG flag in SystemUI
2014-10-31 00:00:39 +00:00
Chris Wren
112b61428e
am e459a46c: am 98204c18: am b7efa04d: Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev
...
* commit 'e459a46c471f465c594201db7ccff25031a89433':
Add logging to diagnose notification click issue.
2014-10-31 00:00:34 +00:00
Andre Eisenbach
c76b3ef6f9
am 8018fae1: am dfc47254: am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev
...
* commit '8018fae1c1747f0b940276650987aa68e9a16345':
Fix crash during Bluetooth on/off stress test
2014-10-31 00:00:29 +00:00
David Friedman
e048758da8
am 5decda26: am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '5decda261a30edf9e9ddc0a4f30de870b67724c8':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-31 00:00:25 +00:00
Deepanshu Gupta
38d1fdede3
am 9f4979bf: am c2a72054: am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.
...
* commit '9f4979bf1159e156a8bc0936474f3378a274d96e':
Add missing delegate for AnimatorInflater.
2014-10-31 00:00:21 +00:00
Geoff Mendal
2be73397c6
am dd42fb6d: (-s ours) am f658b88f: (-s ours) am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'dd42fb6dda5ad200b00c9bd7f8c81cca346d8bc2':
Import translations. DO NOT MERGE
2014-10-31 00:00:16 +00:00
Geoff Mendal
7e247e2e7f
am 721090ae: (-s ours) am 550fa6b6: (-s ours) am 2c5e5ef5: (-s ours) am c88fbd3c: (-s ours) Import translations. DO NOT MERGE
...
* commit '721090aeac79c858ead819447d915e58ba0ee570':
Import translations. DO NOT MERGE
2014-10-31 00:00:12 +00:00
Wink Saville
ae6e330d90
am 4745d36c: (-s ours) am e8ae9961: (-s ours) am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '4745d36c3e4c9e1b30ab6bd6af537c460e99f483':
Import translations. DO NOT MERGE
2014-10-31 00:00:08 +00:00
Deepanshu Gupta
719b92f3c7
am a9f20a25: am 2df4ea46: am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev
...
* commit 'a9f20a25d2bd417a13c9ab56476c9b52cf1463b2':
Skip loading animations.
2014-10-31 00:00:03 +00:00
Deepanshu Gupta
7d86136592
am b9bbcccb: am f82046b2: am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev
...
* commit 'b9bbcccb5aaae55bcb0a7e14982fb06ae21f5d0c':
Fix multiple styles case in resource resolution.
2014-10-30 23:59:59 +00:00
Deepanshu Gupta
95052e3bb0
am 73b1b5a6: am c5afeb2c: am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev
...
* commit '73b1b5a69f8987228f7b84b236c15148560982b8':
Use right theme for drawable inflation.
2014-10-30 23:59:54 +00:00
Alan Viverette
571355d9f5
am 7d965566: am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev
...
* commit '7d96556604046bb0c0f4e4c6e5ac4ca487cdbb06':
Add content description to Toolbar collapse button
2014-10-30 23:59:43 +00:00
Andre Eisenbach
8d9a4da729
am 1bf7bca5: am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
...
* commit '1bf7bca511e3fdbb5e71bb71158d56400538b910':
Fix exception in AudioService when no BT Headset is connected.
2014-10-30 23:59:39 +00:00
Geoff Mendal
1fab8f72ff
am 3488549f: (-s ours) am b2c607db: (-s ours) am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3488549f75ef5354aa562c03b179b07cbdf3fa6b':
Import translations. DO NOT MERGE
2014-10-30 23:59:34 +00:00
Calin Juravle
100a33bd38
am 37e232dc: am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev
...
* commit '37e232dc9cf867a81db92988f5f014ef573e3f97':
Use native brige only if we have a private data directory.
2014-10-30 23:59:30 +00:00
Svetoslav
6c70290ff0
Adding APIs to enable apps to influence accessibility traversal.
...
Accessibility focus is a token that can be put on any view and is
entirely controlled by accessibility services which decide whether
to put accessibility focus on a given view and what the traversal
strategy is.
Currently accessibility service use the view tree structure for
traversal which does not always reflect the logical order and the
user experience is sub-optimal. In such cases apps should be able
to influence how they are traversed for accessibility.
This change adds the notion of an accessibilty traversal order.
If a view has next in the traversal, an accessibility service has
to traverse the content of this view before traversing the content
next one.
This change will enable accessibility service to move away from
using the view tree and use spatial location of the content while
app developers can also influence the treversal order.
bug:17319923
Change-Id: Ib67ae4577f30b2c96575c71538dc1afdea08bfd3
2014-10-30 16:55:53 -07:00
Alan Viverette
c2663dfdab
am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev
...
* commit '0ab3e1df1de76f54296eefb1df05664950da8d2b':
Update drawable state after updating tint list
2014-10-30 23:44:49 +00:00
Svetoslav
65895facf2
am 39f35336: am d3786a59: Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev
...
* commit '39f35336e528434e59f4ea317498919d8d4f9dbd':
Print preview disappearing if printer is changed.
2014-10-30 23:44:43 +00:00
Alan Viverette
b50a6f39ca
am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
...
* commit 'baed009eaeaacffef7cc0972517434451e357aef':
Add setters for window elevation and clipToOutline properties
2014-10-30 23:44:37 +00:00
Alan Viverette
aff329f867
am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
...
* commit '9b5a4e9dafda3c9c5c62d3d7cf151f13c4126309':
Ensure accessibility focus rect is drawn correctly
2014-10-30 23:44:31 +00:00
Alan Viverette
136974c066
am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
...
* commit '19b1c26622bd17165f2bb187fcddf036fd3f53cd':
Create translucent hardware renderer if surface insets are non-zero
2014-10-30 23:44:25 +00:00
Dianne Hackborn
92faa96a26
am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
...
* commit '8f53ad8e7335068b4dd96db10916c3889960de5a':
Condense AndroidRuntime init log, include uid running under.
2014-10-30 23:44:20 +00:00
Tom Taylor
d034f1a3d4
am b281c068: am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
...
* commit 'b281c06834f8d5b60a8757f3fe603f003e06aa77':
Add a missing mms_config constant to SmsManager
2014-10-30 23:44:15 +00:00
Jeff Hao
05ea3213fd
am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
...
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
Change boot screen title to "Android is starting" when not upgrading.
2014-10-30 23:44:09 +00:00
Tyler Gunn
2a36953394
am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
...
* commit '7577f3dd8b738d73253f0c6bfe2383ef71a9ba20':
Communicating participant changes to conference controller.
2014-10-30 23:44:03 +00:00
Alan Viverette
bfc8599f43
am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
...
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
Use action mode context for ActionMode menu inflater
2014-10-30 23:43:58 +00:00
Vladimir Marko
54076d72f7
am 0904509f: am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
...
* commit '0904509ff809fa2db59603a2d8f2a5a7ca64fa4f':
Fix android_media_AudioSystem_getMasterMute return type.
2014-10-30 23:43:52 +00:00
Chris Wren
04a14e599e
am 7837294b: am 755f4021: fix build break from mis-named DEBUG flag in SystemUI
...
* commit '7837294b84550ac9c7b6ecd51b9a8ccb153cc413':
fix build break from mis-named DEBUG flag in SystemUI
2014-10-30 23:43:47 +00:00
Chris Wren
e459a46c47
am 98204c18: am b7efa04d: Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev
...
* commit '98204c18208888610f9804d9a33cd636de489a81':
Add logging to diagnose notification click issue.
2014-10-30 23:43:41 +00:00
Andre Eisenbach
8018fae1c1
am dfc47254: am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev
...
* commit 'dfc472542f22469aca4982d4b87ed3e1d699f473':
Fix crash during Bluetooth on/off stress test
2014-10-30 23:43:37 +00:00
David Friedman
5decda261a
am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-30 23:43:31 +00:00
Deepanshu Gupta
9f4979bf11
am c2a72054: am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.
...
* commit 'c2a72054b158b318fdef54989e39e9220023d4a8':
Add missing delegate for AnimatorInflater.
2014-10-30 23:43:26 +00:00
Geoff Mendal
dd42fb6dda
am f658b88f: (-s ours) am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'f658b88fd1ee3bd92a8c7f32560217fd9805f7d6':
Import translations. DO NOT MERGE
2014-10-30 23:43:21 +00:00
Geoff Mendal
721090aeac
am 550fa6b6: (-s ours) am 2c5e5ef5: (-s ours) am c88fbd3c: (-s ours) Import translations. DO NOT MERGE
...
* commit '550fa6b6751387a83b09392d9e042e8ccd2751d0':
Import translations. DO NOT MERGE
2014-10-30 23:43:16 +00:00
Wink Saville
4745d36c3e
am e8ae9961: (-s ours) am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'e8ae9961b47452e7217f131df294a19304f0cb45':
Import translations. DO NOT MERGE
2014-10-30 23:43:11 +00:00
Deepanshu Gupta
a9f20a25d2
am 2df4ea46: am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev
...
* commit '2df4ea4601075b3b0ef3e87d67f7107cbaeb5de2':
Skip loading animations.
2014-10-30 23:43:05 +00:00
Deepanshu Gupta
b9bbcccb5a
am f82046b2: am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev
...
* commit 'f82046b23367e844b43318d9cb73200750a042a5':
Fix multiple styles case in resource resolution.
2014-10-30 23:42:59 +00:00
Deepanshu Gupta
73b1b5a69f
am c5afeb2c: am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev
...
* commit 'c5afeb2cbbbf762013306397507fa2059d3aaf13':
Use right theme for drawable inflation.
2014-10-30 23:42:52 +00:00
Alan Viverette
7d96556604
am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev
...
* commit '73ab31f610e15e5bb275132845f0146caa4039c6':
Add content description to Toolbar collapse button
2014-10-30 23:42:46 +00:00
Andre Eisenbach
1bf7bca511
am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
...
* commit '34964701e0ff9c07e8d3456fe6d1246d6e8078d1':
Fix exception in AudioService when no BT Headset is connected.
2014-10-30 23:42:40 +00:00
Geoff Mendal
3488549f75
am b2c607db: (-s ours) am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'b2c607dbb876d2d32565e3183f472ea278a609ec':
Import translations. DO NOT MERGE
2014-10-30 23:42:35 +00:00
Calin Juravle
37e232dc9c
am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev
...
* commit '21c3666effbcc79737af2f80f930fa9deee1622e':
Use native brige only if we have a private data directory.
2014-10-30 23:42:30 +00:00
Calin Juravle
c147077480
am aab0c1af: resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp.
...
* commit 'aab0c1af12c3a7495e0aa8b266a46e5e557323ce':
PreInitializeNativeBridge only if its Available
2014-10-30 23:42:15 +00:00
Alan Viverette
19745dc0f1
am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev
...
* commit '0c189ca5c4ee8a61c89d437ff22fd2628b353765':
Only draw AbsListView selector when focused or pressed
2014-10-30 23:30:33 +00:00
George Mount
cfff54270b
am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
...
* commit '57928195a89971e89273c4ef06397d78b0bd0233':
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
2014-10-30 23:30:28 +00:00
Scott Rowe
dfeb60558e
am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
...
* commit 'b31c2b07140481c2cd45367b16f77a710765bc85':
docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-10-30 23:29:18 +00:00
Calin Juravle
aab0c1af12
resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp.
...
Change-Id: I50095f77a43c7e116bcedb1ad7cb7b45640cf1c7
2014-10-30 23:27:54 +00:00
Alan Viverette
0c189ca5c4
Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev
2014-10-30 23:15:13 +00:00