Joe Malin
7bf74bc04c
am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
...
* commit '1e3a02030949df8c1d1f37a37fc23f25357632f0':
Android Training: Add Location Testing Lesson
2013-09-12 10:51:12 -07:00
Joe Malin
1e3a020309
am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
...
* commit '6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
Android Training: Add Location Testing Lesson
2013-09-12 10:48:38 -07:00
Joe Malin
6f9e30e3b7
Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
2013-09-12 17:45:05 +00:00
Daniel Sandler
f3da15bde7
Merge "Remove spurious density-specific default wallpaper." into klp-dev
2013-09-12 17:35:53 +00:00
Joe Malin
72fdbc88bb
Android Training: Add Location Testing Lesson
...
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
2013-09-12 10:07:30 -07:00
Wink Saville
99e7847b76
Define config_volte_replacement_rat.
...
Default value is 0 which means there is no replacement and
PhoneProxy#phoneObjectUpdater will not replace a VoLTE RAT.
Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
2013-09-12 09:48:55 -07:00
Dirk Dougherty
16dae5997b
am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
...
* commit '834ba47485a5fb55c89d8f22b826bdb26049f6d6':
Pass whitelist of sample groups to doclava.
2013-09-12 09:28:18 -07:00
Dirk Dougherty
834ba47485
am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
...
* commit '4c6cde545c5d2e76d9ba8ef926399463369da7e7':
Pass whitelist of sample groups to doclava.
2013-09-12 09:22:20 -07:00
Dirk Dougherty
4c6cde545c
am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
...
* commit '89579294ce0fbe728738fa09fb45cc53fd79bfb5':
Pass whitelist of sample groups to doclava.
2013-09-12 09:15:25 -07:00
John Spurlock
43c70b0ccf
Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev
2013-09-12 16:05:56 +00:00
Dirk Dougherty
89579294ce
Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
2013-09-12 16:01:52 +00:00
Jeff Sharkey
357f9e34ca
Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev
2013-09-12 16:00:40 +00:00
John Spurlock
5fee8360f8
Status bar interaction veto revoked on ups/cancels.
...
If we get an ACTION_UP or ACTION_CANCEL and the shade is not
expanded, treat this as a signal of !interacting, revoking
the interaction veto.
Bug:10711758
Change-Id: Ia69ff24880193fa8d99ece79053eeb95dfa9ba71
2013-09-12 11:35:08 -04:00
Flavio Lerda
b25cfdf1ec
Merge "Document the order of values returned by keyAt()." into klp-dev
2013-09-12 11:49:29 +00:00
Jean Chalard
c743cb9477
Don't send the same values to onUpdateSelection repeatedly
...
If the IME is repeatedly changing the text in its
onUpdateSelection handler, this will crash it with a
stack overflow exception. It's better than the old behavior,
which would result in a busyloop likely to make the
device completely unresponsive.
Bug: 10301239
Change-Id: I170cfb8ef20fc056d4725931890a987aefcaea8b
2013-09-12 16:52:56 +09:00
Dirk Dougherty
a6c02679e1
Pass whitelist of sample groups to doclava.
...
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
2013-09-12 00:37:50 -07:00
Daniel Sandler
0594b192cd
Remove spurious density-specific default wallpaper.
...
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
2013-09-12 01:18:55 -04:00
Igor Murashkin
9ea4ae67fb
camera_metadata: add android.lens.state MOVING enum value
...
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
2013-09-11 21:43:50 -07:00
Jeff Brown
737d2c0b92
Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev
2013-09-12 04:03:31 +00:00
Jeff Brown
fb07349c07
Make View onKeyUp symmetric with onKeyDown.
...
Properly use KeyEvent.isConfirmKey() in both methods.
Change-Id: Id87158f2163f75af20350dc445df6a59f7190752
2013-09-11 20:51:13 -07:00
Baligh Uddin
4dff98689d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-12 02:46:12 +00:00
Baligh Uddin
c57bd8b996
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-12 02:45:52 +00:00
Baligh Uddin
0792054f6b
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-12 02:45:12 +00:00
Robert Greenwalt
126755cf41
Fix Wifi Batch Scanning
...
Some parsing bugs, more debug logs, etc.
bug:9301872
Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
2013-09-11 19:31:20 -07:00
Adam Powell
5fcf5b9fd3
Show alternate menu panel on devices with menu key
...
Provide a softer transition to the overflow-everywhere world for
devices with menu keys. The panel menu will still be used on these
devices in response to a menu key press even in the presence of an
action bar with overflow.
Fix a few lingering bugs around dispatching the open-overflow
transition that caused problems with this along the way.
Change-Id: I9d77c70f6d15c47160ac06292984101d619c44e6
2013-09-11 19:17:38 -07:00
Alex Ray
c333a3f7c6
Merge "consumer_ir: add length to get carrier freqs" into klp-dev
2013-09-12 01:55:27 +00:00
Selim Gurun
e4fdc84794
Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev
2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e
Revert "Add permissions for the InCallUI Split."
...
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.
Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
2013-09-12 00:57:34 +00:00
Alex Ray
03ad7ae1bc
Merge "consumer ir: clarify @link in documentation" into klp-dev
2013-09-12 00:40:50 +00:00
Jeff Sharkey
de2b22fbc6
Handle pipe thumbnails, acquire unstable refs.
...
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream. Also switch to using unstable provider references
to avoid crashing DocumentsUI.
Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
2013-09-11 17:33:52 -07:00
Xia Wang
b32a80425d
Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev
2013-09-12 00:24:31 +00:00
Lajos Molnar
03cd51cd17
Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev
2013-09-12 00:19:17 +00:00
Eric Laurent
95a181397d
Merge "Add HOTWORD as an AudioSource" into klp-dev
2013-09-12 00:15:31 +00:00
Eino-Ville Talvala
ede3eeb72c
Merge changes Ia6300c23,Idd2ae8ad into klp-dev
...
* changes:
Camera2: Immutable metadata
Camera2: Listener rework and other API updates
2013-09-12 00:08:04 +00:00
Ruben Brunk
91019c9ef3
Merge "Remove dependency on JNIHelp header side effects." into klp-dev
2013-09-12 00:01:28 +00:00
Amith Yamasani
bdd06c0a13
Merge "Change selection highlight for intent disambig dialog" into klp-dev
2013-09-11 23:56:44 +00:00
Chong Zhang
bcb97996eb
Merge "Pass subtitle track properties to SubtitleController" into klp-dev
2013-09-11 23:51:45 +00:00
Mindy Pereira
af2d8bbdbd
Merge "Scale feels too quick in relation to movement" into klp-dev
2013-09-11 23:33:02 +00:00
Alex Ray
5022f275e3
consumer_ir: add length to get carrier freqs
...
Change-Id: I2c1ac27e46c0bcfdfadef227a2fa79bdcf7085d4
2013-09-11 16:21:25 -07:00
Alex Ray
1e679441af
consumer ir: clarify @link in documentation
...
Change-Id: Ifebd0b550f5d9860697539646596a0b1cc782949
2013-09-11 15:39:05 -07:00
Kenny Root
931f6f8767
Merge "Fix another off-by-one error in ZipFileRO" into klp-dev
2013-09-11 22:37:03 +00:00
Kenny Root
1c7cf90af4
Fix another off-by-one error in ZipFileRO
...
Bug: 10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
2013-09-11 15:28:39 -07:00
Chong Zhang
f8ca13b7a0
Pass subtitle track properties to SubtitleController
...
Bug: 10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
2013-09-11 15:02:47 -07:00
Xia Wang
0076729d38
Use setAirplaneMode() API for Connectivity Manager tests
...
Change-Id: I2e35c58e4101b6b5fe9efdb5adad922402d38b6f
2013-09-11 14:44:30 -07:00
Selim Gurun
a5c86c644b
Publish Print Api for Webview
...
Bug:10652036
Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64
2013-09-11 14:42:50 -07:00
Chet Haase
abd3d778e5
Hide translucent activity conversion API
...
This API and functionality is not yet completely baked. It's worth
thinking more about this mechanism before exposing it as public API.
Issue #10461415 KLP API Review: Activity convert to translucent
Change-Id: I94d986b62443b3bfa7a9a19807ecebe36bf57e07
2013-09-11 14:33:05 -07:00
Zhijun He
e550446dcf
Merge "ImageReader: Skip size check for BLOB format" into klp-dev
2013-09-11 21:31:54 +00:00
destradaa
f8a910fbd5
Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev
2013-09-11 21:15:34 +00:00
Chet Haase
ff58f92a0a
Add exclude() methods to Transition
...
It would be useful for a transition to declare not just which
targets it wants to be run on, but also which targets it wants
to avoid. For example, you may not want to animate the items of
a ListView, or some other specific target in the view hierarchy.
This change adds various exclude*() methods which make it
possible to alter a transition to automatically ignore specific
views, ids, or classes in the hierarchy.
Issue #10692794 Transitions: Need API for excluding targets
Change-Id: If38025cdbee537a545e5a4268cbbd763af4622c5
2013-09-11 13:53:43 -07:00
Adam Powell
6847447da0
Merge "Action bar refactoring and transitions" into klp-dev
2013-09-11 20:38:41 +00:00