Jeff Tinker
959c27f95d
am 50bb6215: Merge "Add support for max-res decode" into lmp-dev
...
* commit '50bb621501fafc85be31e2039a43e6bbe93344bd':
Add support for max-res decode
2014-09-10 00:02:17 +00:00
Adam Lesinski
325820e197
am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev
...
* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
2014-09-09 23:56:38 +00:00
Jeff Tinker
b00ab012bf
Merge "Add support for max-res decode" into lmp-dev
2014-09-09 23:56:11 +00:00
Robert Ly
0cb4c738fb
am 9f60bc3f: am 52a18161: docs: update api dashboard for september
...
* commit '9f60bc3f129037f2f1b05a09902c8e97d66322f3':
docs: update api dashboard for september
2014-09-09 23:51:10 +00:00
Adam Lesinski
732edf098f
Merge changes I79ba54d7,I224fb4b6 into lmp-dev
...
* changes:
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
2014-09-09 23:50:04 +00:00
Robert Ly
9f60bc3f12
am 52a18161: docs: update api dashboard for september
...
* commit '52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
docs: update api dashboard for september
2014-09-09 23:40:51 +00:00
Tsuwei Chen
16935e2f3a
am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev
...
* commit '5675ab1b691f2dc2b94bbdd78bbdbba90896cb01':
Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144
2014-09-09 23:34:44 +00:00
Tsuwei Chen
98ff7bce66
Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev
2014-09-09 23:29:14 +00:00
Robert Ly
52a1816180
docs: update api dashboard for september
...
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
2014-09-09 16:28:08 -07:00
Adam Lesinski
99d0ad0dff
am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev
...
* commit '799dc7483f6c6a4b554f2a3dad4b801371347cea':
AAPT: Don't crash on illegal symbol name
2014-09-09 23:25:02 +00:00
Zhijun He
b67c3102c9
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
...
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
2014-09-09 16:19:10 -07:00
Adam Lesinski
e7ad74f070
Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev
2014-09-09 23:15:08 +00:00
wsmlby
dd806b0ed3
Fix AppCompatibility test for different process name of one package.
...
Change-Id: Ic30e5ee81fe6ea82e88d2c5541dc9fa9eba71043
2014-09-09 16:10:12 -07:00
Adam Lesinski
3fb8c9b50e
AAPT: Don't crash on illegal symbol name
...
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.
External bug: https://code.google.com/p/android/issues/detail?id=75876
Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
2014-09-09 16:05:10 -07:00
Alan Viverette
463f4c10b4
am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
...
* commit 'b7afde5c05fa7bc37aa8cdd58b55b298dbeca004':
Bring up the IME when TextView receives ACTION_CLICK
2014-09-09 23:04:50 +00:00
Adam Powell
dc46298214
am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
...
* commit '8197da7703d0753d29b3ab5fda8771ef9d165d40':
ActionMenuViews always reserve overflow when creating their own menus
2014-09-09 23:04:45 +00:00
Alan Viverette
a7cbaeb138
Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
2014-09-09 22:58:28 +00:00
Adam Powell
ad0c450d4d
Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
2014-09-09 22:56:20 +00:00
Christopher Tate
82ecd480f4
am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
...
* commit '3b9417ff52248190fa324eef87bec8ab050e42f4':
Fix BackupManager.isBackupEnabled()
2014-09-09 22:54:43 +00:00
Winson Chung
2ba16715b5
am b68c78bd: Announcing the task list as you scroll. (Bug 15699050)
...
* commit 'b68c78bdec4f680e4b5536a7f8df90513cc5aba7':
Announcing the task list as you scroll. (Bug 15699050)
2014-09-09 22:54:39 +00:00
Winson Chung
a1b68ee2ca
am 5ec5fa49: Fixing issue with Recents showing blank. (Bug 16987565)
...
* commit '5ec5fa491c6cba8a6bb451d0aa121318df927ffd':
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-09 22:54:31 +00:00
Winson Chung
d13d7b533d
am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
* commit 'd7a863be76afb458cb59472ad02d49568ada6e04':
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
2014-09-09 22:54:16 +00:00
Winson Chung
508f0fbd61
am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
* commit '7d631483fc22a2d66f2510c93be8387d6c2bbdca':
Adding task switching animation xmls for further tweaking. (Bug 16656169)
2014-09-09 22:54:11 +00:00
Winson Chung
90ba230114
am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
* commit 'b754940a89eea209763b564325e100f45bd1c0c3':
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
2014-09-09 22:54:07 +00:00
Jeff Sharkey
ece96a8131
am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
...
* commit 'c5d4ebd640a0bca62fb52a42830c8646316ee386':
Missing manifest error should be NO_CERTIFICATES.
2014-09-09 22:54:02 +00:00
Christopher Tate
363c408af5
Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
2014-09-09 22:51:27 +00:00
Winson Chung
ee44595bd5
Announcing the task list as you scroll. (Bug 15699050)
...
Change-Id: I7453f41a2c87241e538cdc7281cdc20a8710ebbb
2014-09-09 22:50:01 +00:00
Winson Chung
8a8d9611e2
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-09 22:49:24 +00:00
Winson Chung
e5c06a6431
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
Change-Id: Id8f96455f6e11a13a8ac12d341464bca4419d7c5
2014-09-09 22:49:04 +00:00
Winson Chung
3aa9c221c0
Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
Change-Id: I472116cb3d86a3f90a935b2a3ac058ffc2ac1b5d
2014-09-09 22:48:19 +00:00
Winson Chung
7937fdb341
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
Change-Id: I769c0647417efeda9b39913c01c62be0d6ff7887
2014-09-09 22:47:43 +00:00
Jeff Sharkey
ad5f44a68c
Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
2014-09-09 22:44:52 +00:00
Christopher Tate
9e079298ed
Fix BackupManager.isBackupEnabled()
...
It wasn't properly lazy-initializing the service binder, so it always
thought the backend service didn't exist, and so always returned false.
Also directly validated that every usage of sService in the module is
now correctly lazy-initialized.
Bug 16661321
Change-Id: If5fbb18aef81bfa8fd70eb40a1f6af54cc96d804
2014-09-09 22:36:14 +00:00
Yin-Chia Yeh
ec261ead49
am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
...
* commit '916d8fafe6b61b7499cc8d41331adfb11d2136fa':
camera2: make 3A regions null when not available
2014-09-09 22:31:57 +00:00
Eino-Ville Talvala
a8b4bb8c90
am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
...
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
2014-09-09 22:31:52 +00:00
Tsuwei Chen
67862cf3de
Move carrier-specific GPS parameters out of framework/base directory.
...
Bug: 17288144
All carrier values has been moved to device only directory, in this change:
https://googleplex-android-review.git.corp.google.com/#/c/543322
Change-Id: Idb958a75edc612dc83c8382fa6546c3588889e39
2014-09-09 22:27:04 +00:00
Yin-Chia Yeh
8544c7da86
Merge "camera2: make 3A regions null when not available" into lmp-dev
2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
31913c334a
Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
2014-09-09 22:20:58 +00:00
vandwalle
1853fddaf4
am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev
...
* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
make autojoin associated scan period a config opttion
2014-09-09 22:19:48 +00:00
Svetoslav
08dd15e1f4
am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev
...
* commit '3f49b128bc94c1b1e66decf96d46a83bcdb9a62b':
Trim unnecessary pages when printing.
2014-09-09 22:19:44 +00:00
vandwalle
2bc9f4178a
Merge "make autojoin associated scan period a config opttion" into lmp-dev
2014-09-09 22:12:06 +00:00
Svetoslav
15040e0a58
Merge "Trim unnecessary pages when printing." into lmp-dev
2014-09-09 22:11:20 +00:00
Adrian Roos
3870d451f7
Add system trust agents on first boot or when adding user
...
While we're in there also call listeners when they're added
so they know the state immediately.
Bug: 17258031
Change-Id: I5f1186314795f3fafd78e1b3e2d5102cdaec65d6
2014-09-10 00:02:38 +02:00
Lajos Molnar
287cf721bc
am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
...
* commit 'adbca3e552abc358326b4245a4fc4b8761e79b7e':
initialize codec list before MediaCodec.getCodecInfo()
2014-09-09 22:01:17 +00:00
Guang Zhu
63e47699b9
am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev
...
* commit 'a3cd75926fd65afee93305ebe88f01c05a27be96':
add some assert messages to download manager test
2014-09-09 22:01:07 +00:00
Jeff Sharkey
bc09755e19
Missing manifest error should be NO_CERTIFICATES.
...
When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING. Also remove redundant layer of
debugging details when wrapping exceptions.
Bug: 15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
2014-09-09 14:57:26 -07:00
Lajos Molnar
bc67eee710
Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
2014-09-09 21:55:43 +00:00
Guang Zhu
3ab7bf1a3d
Merge "add some assert messages to download manager test" into lmp-dev
2014-09-09 21:51:17 +00:00
John Spurlock
b06cd76a69
am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
...
* commit '7fa275831652f2fcaf6df2d10264f2c9b8ae0346':
QS: Fix tile padding on dual tile first lines.
2014-09-09 21:49:52 +00:00
Alan Viverette
9597427fe9
am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev
...
* commit 'ba2ce6fa080df627646501f58bab5fde76b0f2c2':
Update alert dialog styling to match Material spec
2014-09-09 21:49:47 +00:00