Adam Powell
b28776d5d5
am e9186d05: am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
...
* commit 'e9186d0552f7d38e11be2b809c30e767bf259c8b':
ActionMenuViews always reserve overflow when creating their own menus
2014-09-10 01:09:29 +00:00
Christopher Tate
6e78c704e7
am 2e44285f: am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
...
* commit '2e44285f8a7a235cb2ac44514bc702f9e3fd76eb':
Fix BackupManager.isBackupEnabled()
2014-09-10 01:09:22 +00:00
Winson Chung
ee4705f449
am 36b7f7b2: am 2bd1147f: am b68c78bd: Announcing the task list as you scroll. (Bug 15699050)
...
* commit '36b7f7b27c6f940689bb0964ea78789b95e57584':
Announcing the task list as you scroll. (Bug 15699050)
2014-09-10 01:09:14 +00:00
Winson Chung
64802cf821
am a1ee14ca: am f5096562: am 5ec5fa49: Fixing issue with Recents showing blank. (Bug 16987565)
...
* commit 'a1ee14cab0341b6cccdcf74779588b99572fe9df':
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-10 01:09:08 +00:00
Winson Chung
d5cafbdc7e
am 3f08bb15: am 7b867b10: am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
* commit '3f08bb1557971ca161ec8fcd9b0932acf739029e':
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
2014-09-10 01:09:00 +00:00
Winson Chung
361f8d6b03
am 1c4ae188: am bb906f5b: am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
* commit '1c4ae188605ab379b1147be915913e90325a2d02':
Adding task switching animation xmls for further tweaking. (Bug 16656169)
2014-09-10 01:08:50 +00:00
Winson Chung
5da97e40d0
am e538be19: am 6c4240b8: am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
* commit 'e538be19bd21c202289447ccd991c84f65cd17f5':
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
2014-09-10 01:08:42 +00:00
Jeff Sharkey
823e56b79f
am f7061676: am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
...
* commit 'f706167630a44d372fdddb0321c0ecb0ed5d1bb3':
Missing manifest error should be NO_CERTIFICATES.
2014-09-10 01:08:32 +00:00
Yin-Chia Yeh
bd4e8987ce
am 74405587: am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
...
* commit '7440558739b20b835923e53866cd1998e6a77a37':
camera2: make 3A regions null when not available
2014-09-10 01:08:25 +00:00
Eino-Ville Talvala
b0fbabb77b
am 75b0c316: am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
...
* commit '75b0c316390daeddbfcc897bcd4a763fed557fef':
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
2014-09-10 01:08:16 +00:00
vandwalle
d5b175d67b
am cfd59eff: am 2dd81a13: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev
...
* commit 'cfd59eff3b9f66bbc3ae4024f46bc7b2438badd5':
make autojoin associated scan period a config opttion
2014-09-10 01:08:09 +00:00
Svetoslav
5014c1daf7
am 36a9a4c7: am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev
...
* commit '36a9a4c7920e7faa02a4b9444b7a247e89923b9d':
Trim unnecessary pages when printing.
2014-09-10 01:07:59 +00:00
Lajos Molnar
5498ba4a1f
am 55b5fb8e: am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
...
* commit '55b5fb8e25f0ef15377c08db9c1ec82e03482e18':
initialize codec list before MediaCodec.getCodecInfo()
2014-09-10 01:07:54 +00:00
Guang Zhu
ffd8367c20
am 0472349a: am 7f27443e: am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev
...
* commit '0472349a346726f2d7bdc77f805f60f93e8c40d0':
add some assert messages to download manager test
2014-09-10 01:07:44 +00:00
Dianne Hackborn
8611dde57b
am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev
...
* commit '803a6f399a2e0bfac8beb5d7ac2425dd3d9bdc46':
Fix build.
2014-09-10 01:04:22 +00:00
Eric Laurent
1695b30736
am 4f0149fe: Merge "SoundTriggerHelper: handle media server death" into lmp-dev
...
* commit '4f0149fe3d4057b61f7df77820ef6df0bd2cfbb7':
SoundTriggerHelper: handle media server death
2014-09-10 01:01:33 +00:00
Junda Liu
12152a0319
am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.
...
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
Add ForSubscriber suffix to APIs w/ subId argument.
2014-09-10 01:01:24 +00:00
Eric Laurent
0fd9d8a2c8
Merge "SoundTriggerHelper: handle media server death" into lmp-dev
2014-09-10 00:53:00 +00:00
Amit Mahajan
90ee64b7b6
am 299ad234: am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev
...
* commit '299ad23423e22d137a8f5a373ed0154b00114077':
Support to load default voicemail number from the configuration.
2014-09-10 00:52:29 +00:00
wsmlby
c651a1020b
am 3e27567c: am d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev
...
* commit '3e27567cc5be566dda117881f9f4937dd573f551':
Fix AppCompatibility test for different process name of one package.
2014-09-10 00:52:24 +00:00
Jinsuk Kim
0e1b0b0560
am ebab0f54: am a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev
...
* commit 'ebab0f54d7ee4db8d22e7cacec6af628229e9a06':
CEC: Stub MHL Controller
2014-09-10 00:52:19 +00:00
Robert Ly
658f04dcfc
am 408fcdb8: am bb6ede49: am 0cb4c738: am 9f60bc3f: am 52a18161: docs: update api dashboard for september
...
* commit '408fcdb82f4a5da1e163b3051c8c7a0fcd4f7de1':
docs: update api dashboard for september
2014-09-10 00:51:57 +00:00
Jeff Tinker
bbbbc1c17c
am 6a884aad: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev
...
* commit '6a884aad3c1df551cfa2a87c9b69c7092cb8c6b6':
Add support for max-res decode
2014-09-10 00:51:49 +00:00
Adam Lesinski
ceb63ed177
am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev
...
* commit '2413aa5838c0d9e653c419c4566ab76a5c7bde2d':
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
2014-09-10 00:51:43 +00:00
Tsuwei Chen
441d6366cc
am 6179e8c1: am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev
...
* commit '6179e8c15bf13babf994b4fb9df58c30e9c1c831':
Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144
2014-09-10 00:51:20 +00:00
Adam Lesinski
017d1bdca7
am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev
...
* commit '716c7279854318eeabad39b7bb187aa69ad41c97':
AAPT: Don't crash on illegal symbol name
2014-09-10 00:51:15 +00:00
Alan Viverette
8c2b2085c9
am 0ca92d44: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
...
* commit '0ca92d44894f7af06f595368281034d762693c61':
Bring up the IME when TextView receives ACTION_CLICK
2014-09-10 00:50:53 +00:00
Adam Powell
361ca8c1e9
am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
...
* commit '129aeb1644b8faf9600d74e18b2ab799a121830f':
ActionMenuViews always reserve overflow when creating their own menus
2014-09-10 00:50:48 +00:00
Christopher Tate
239e587ab9
am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
...
* commit '1ca58e08f44ae97ed238bdbb820eea12d62f6ce3':
Fix BackupManager.isBackupEnabled()
2014-09-10 00:50:41 +00:00
Winson Chung
30d10cb840
am 2bd1147f: am b68c78bd: Announcing the task list as you scroll. (Bug 15699050)
...
* commit '2bd1147f461ed410a107c8fc32df04f7c7e16c26':
Announcing the task list as you scroll. (Bug 15699050)
2014-09-10 00:50:31 +00:00
Winson Chung
b783133c37
am f5096562: am 5ec5fa49: Fixing issue with Recents showing blank. (Bug 16987565)
...
* commit 'f50965621d5e7794901629f70345425aac42f728':
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-10 00:50:26 +00:00
Winson Chung
ffe0216be4
am 7b867b10: am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
* commit '7b867b10bf4ba61b4b0792168c4cd290c47372e6':
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
2014-09-10 00:50:21 +00:00
Winson Chung
9e9fddeb75
am bb906f5b: am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
* commit 'bb906f5b0be00d282a488ac8ff461fac546b5f57':
Adding task switching animation xmls for further tweaking. (Bug 16656169)
2014-09-10 00:50:16 +00:00
Dianne Hackborn
27d5e078f4
am 829b79f6: Merge "Fix build." into lmp-dev
...
* commit '829b79f67a23f89e994ea720cd0c4a146f57ba5f':
Fix build.
2014-09-10 00:50:12 +00:00
Winson Chung
768730c7b4
am 6c4240b8: am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
* commit '6c4240b8566098ecd6bc56a3085f99efae26eba2':
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
2014-09-10 00:50:11 +00:00
Junda Liu
13e28bb938
Add ForSubscriber suffix to APIs w/ subId argument.
...
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
2014-09-09 17:50:09 -07:00
Jeff Sharkey
2dadfeb306
am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
...
* commit '47bf90808bd42a3fcfd5434ec216a8ba8859f8f0':
Missing manifest error should be NO_CERTIFICATES.
2014-09-10 00:50:06 +00:00
Yin-Chia Yeh
0efe661696
am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
...
* commit '5fc81692af2d249b901a0f7ce4ec6bc5327ff8c2':
camera2: make 3A regions null when not available
2014-09-10 00:49:37 +00:00
Eino-Ville Talvala
2f94ed6cee
am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
...
* commit 'f9e648243298760e96053a90674b30fe00ce3f5c':
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
2014-09-10 00:49:31 +00:00
vandwalle
62609a1146
am 2dd81a13: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev
...
* commit '2dd81a13a6a2f872e9b074f2e2dab6fa390a30fa':
make autojoin associated scan period a config opttion
2014-09-10 00:49:22 +00:00
Svetoslav
87c8260341
am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev
...
* commit 'f1b72b86380b25b933be32c46d4f59a41699a546':
Trim unnecessary pages when printing.
2014-09-10 00:49:17 +00:00
Lajos Molnar
884698e380
am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
...
* commit '4662ef1fcf2b9fe0d9087649beefbf82d2c48fc7':
initialize codec list before MediaCodec.getCodecInfo()
2014-09-10 00:49:02 +00:00
Guang Zhu
5d2792c824
am 7f27443e: am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev
...
* commit '7f27443e5cb4a64570be4da792937662711c3a33':
add some assert messages to download manager test
2014-09-10 00:48:57 +00:00
Dianne Hackborn
d5adbec527
Merge "Fix build." into lmp-dev
2014-09-10 00:40:55 +00:00
Dianne Hackborn
f5cc3644f6
Fix build.
...
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
2014-09-09 17:38:34 -07:00
Amit Mahajan
da3a6a9e2d
am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev
...
* commit '7cd6fc5b838fde5046028518cee44d8fd69cc701':
Support to load default voicemail number from the configuration.
2014-09-10 00:29:11 +00:00
wsmlby
f819e35b2f
am d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev
...
* commit 'd1ed1e81df51543cd1ab45170f12f2ed615f770d':
Fix AppCompatibility test for different process name of one package.
2014-09-10 00:29:06 +00:00
Lajos Molnar
d7e5f680fa
MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
...
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
2014-09-09 17:27:26 -07:00
Eric Laurent
2475e38c10
SoundTriggerHelper: handle media server death
...
Retry to attach sound trigger module when startRecognition() is called.
Bug: 17373746.
Change-Id: I5b2f806b6cab47741d345be1cde73a84f5a62590
2014-09-09 17:26:00 -07:00
Amit Mahajan
f14fb34292
Merge "Support to load default voicemail number from the configuration." into lmp-dev
2014-09-10 00:23:50 +00:00