OSDN Git Service
Selim Cinek [Tue, 25 Mar 2014 23:00:58 +0000 (23:00 +0000)]
am
92a87e30: am
50cd7c39: am
f7805dd7: am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
92a87e302625c69c6a52c3cb595b9ecfacf29129':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 23:00:55 +0000 (23:00 +0000)]
am
f53d1a01: Merge "resolved conflicts for merge of
c1edfc2c to master"
* commit '
f53d1a01972d04402b48476d6a8173285516edd3':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Zhijun He [Tue, 25 Mar 2014 23:00:51 +0000 (23:00 +0000)]
am
aaad0047: Merge "Camera2: Add partial flash state"
* commit '
aaad0047a6c2e7478312b85ebab275a3578ec4c2':
Camera2: Add partial flash state
Adam Lesinski [Tue, 25 Mar 2014 23:00:48 +0000 (23:00 +0000)]
am
7f3b7116: Merge "Shared library resource support"
* commit '
7f3b7116b78ca108f64ca2f5d57515793ef9fd02':
Shared library resource support
Gabriel Peal [Tue, 25 Mar 2014 23:00:43 +0000 (23:00 +0000)]
am
db0dca82: resolved conflicts for merge of
c1edfc2c to master
* commit '
db0dca826d992af1adfa53e10c31f08d3197bb0b':
resolved conflicts for merge of
c1edfc2c to master
Gabriel Peal [Tue, 25 Mar 2014 23:00:40 +0000 (23:00 +0000)]
am
5e44cadf: Merge "resolved conflicts for merge of
c1edfc2c to master"
* commit '
5e44cadfd69c210c11f80cfe599718617a0e6676':
resolved conflicts for merge of
c1edfc2c to master
Baligh Uddin [Tue, 25 Mar 2014 23:00:37 +0000 (23:00 +0000)]
am
05f79758: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
05f79758cd2688f89444a38baba326a0a1c1a438':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:34 +0000 (23:00 +0000)]
am
449616f9: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
449616f9aeff15db215e57e688a3190421e29e55':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:31 +0000 (23:00 +0000)]
am
da94c0ef: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
da94c0efe923db612ca5c743ccca5c33bb742dbf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:28 +0000 (23:00 +0000)]
am
20de38b9: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
20de38b9ab7f4931f88c1bc8931d622dfbab7a88':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:25 +0000 (23:00 +0000)]
am
52528c5e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
52528c5ef0ad6407ed360146a4986e7894b75a3d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:22 +0000 (23:00 +0000)]
am
d894e15c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d894e15c135575698816a6def7c2c384bd49dae7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:19 +0000 (23:00 +0000)]
am
fca9992c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
fca9992c4bef92da76a37399d463e3cb3ab69139':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 23:00:16 +0000 (23:00 +0000)]
am
71d718b7: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
71d718b749554c9c0658082c8d650a02c845fec3':
Import translations. DO NOT MERGE
Gabriel Peal [Tue, 25 Mar 2014 23:00:13 +0000 (23:00 +0000)]
am
2d72d000: Merge "resolved conflicts for merge of
74fb97de to master"
* commit '
2d72d000939acc10ba0f5000689ad86483b7c19e':
resolved conflicts for merge of
74fb97de to master
Chris Craik [Tue, 25 Mar 2014 23:00:11 +0000 (23:00 +0000)]
am
c21929c7: Merge "Fix doc build"
* commit '
c21929c710949a48790fa2701c47cedfabb7b9dc':
Fix doc build
Jean-Michel Trivi [Tue, 25 Mar 2014 23:00:08 +0000 (23:00 +0000)]
am
cd60e3a5: Merge "Begin refactor of MediaFocusControl"
* commit '
cd60e3a57cfdc3d00083287c6589a2c7a7d7b104':
Begin refactor of MediaFocusControl
John Reck [Tue, 25 Mar 2014 23:00:04 +0000 (23:00 +0000)]
am
bcad68ad: Merge "Move where updateProperties is called"
* commit '
bcad68ad80e5a44e5dc6988eddb8acabdc01a737':
Move where updateProperties is called
John Reck [Tue, 25 Mar 2014 23:00:01 +0000 (23:00 +0000)]
am
632717e6: Merge "Add missing null check"
* commit '
632717e60990b900e6d20dddd3935a57dd6a8fa6':
Add missing null check
Tim Kilbourn [Tue, 25 Mar 2014 22:59:59 +0000 (22:59 +0000)]
am
803d91b2: Fix NPE when inflating GradientDrawables.
* commit '
803d91b2b2eef42e1ebe088613f83e555d2bfd04':
Fix NPE when inflating GradientDrawables.
Przemyslaw Szczepaniak [Tue, 25 Mar 2014 22:59:56 +0000 (22:59 +0000)]
am
0a8596dc: Merge "Documentation update for TextToSpeech#getFeatures"
* commit '
0a8596dc0c497404a332ae990b2bd77553cde870':
Documentation update for TextToSpeech#getFeatures
Yohann Roussel [Tue, 25 Mar 2014 22:59:52 +0000 (22:59 +0000)]
am
30494b70: Merge "Add one test application for multidex."
* commit '
30494b70e96a45f91231586b5b5be45a4f6dea1a':
Add one test application for multidex.
Alan Viverette [Tue, 25 Mar 2014 22:59:49 +0000 (22:59 +0000)]
am
eebf17ad: Merge "Unhide touch feedback drawable and wrapper"
* commit '
eebf17ad202f712173840e25da356c5bef870ff8':
Unhide touch feedback drawable and wrapper
Michael Wright [Tue, 25 Mar 2014 22:59:46 +0000 (22:59 +0000)]
am
5da8ca91: Merge "Respect ACTION_CANCEL for joystick fallbacks"
* commit '
5da8ca918967b7100b8f7927c08075e4555347ab':
Respect ACTION_CANCEL for joystick fallbacks
Alan Viverette [Tue, 25 Mar 2014 22:59:42 +0000 (22:59 +0000)]
am
9bbbee11: Merge "Implement APIs for obtaining, caching themed Drawables"
* commit '
9bbbee116e5d480c56676686b96e86e2ef7d83ca':
Implement APIs for obtaining, caching themed Drawables
Chong Zhang [Tue, 25 Mar 2014 22:59:39 +0000 (22:59 +0000)]
am
29e4cf0a: am
2ac81ee6: (-s ours) am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5':
DO NOT MERGE change Surface constructor arg to 64bit
Winson Chung [Tue, 25 Mar 2014 22:59:36 +0000 (22:59 +0000)]
am
c9b0d582: Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."
* commit '
c9b0d582071c7b4fb2538b86e2e0c4c2f914b664':
Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
Ruben Brunk [Tue, 25 Mar 2014 22:59:32 +0000 (22:59 +0000)]
am
0dfdcb10: Merge "camera3: Update whiteLevel/greenSplit docs."
* commit '
0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9':
camera3: Update whiteLevel/greenSplit docs.
Winson Chung [Tue, 25 Mar 2014 22:59:29 +0000 (22:59 +0000)]
am
75c549c5: Merge "Moving task view layout into resource."
* commit '
75c549c537cf44d1f1bb13422a950637f7f5c489':
Moving task view layout into resource.
John Spurlock [Tue, 25 Mar 2014 22:59:27 +0000 (22:59 +0000)]
am
66c49bc9: am
c3b7a671: (-s ours) am
e2cae0a6: am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
66c49bc99d3e33c00c3f674fca9cba06d1abc199':
Unhide Notification kind, rename to category.
John Reck [Tue, 25 Mar 2014 22:59:23 +0000 (22:59 +0000)]
am
78ce1c52: Add back clobbered cleanup
* commit '
78ce1c5247de60a4247d81d168fd9fa97c7591d0':
Add back clobbered cleanup
Jose Lima [Tue, 25 Mar 2014 22:59:20 +0000 (22:59 +0000)]
am
41c2d2ce: Merge "resolved conflicts for merge of
6c45157c to master"
* commit '
41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe':
Added isGame application tag to the manifest
John Reck [Tue, 25 Mar 2014 22:59:17 +0000 (22:59 +0000)]
am
2ddf5166: Merge "Add stagingProperties"
* commit '
2ddf5166ea1da32f7ac63392f369f8a3c36a16df':
Add stagingProperties
Ricardo Cervera [Tue, 25 Mar 2014 22:59:14 +0000 (22:59 +0000)]
am
ae5d7d5d: docs: Added new sensor types. Bug:
10674725
* commit '
ae5d7d5d61def1c7af9d69d3e72a0f5f4a8a6414':
docs: Added new sensor types. Bug:
10674725
Dianne Hackborn [Tue, 25 Mar 2014 22:59:11 +0000 (22:59 +0000)]
Mark Renouf [Tue, 25 Mar 2014 22:59:08 +0000 (22:59 +0000)]
am
de02cdc1: am
7390d4ab: am
3796594c: am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
de02cdc1e95cea19b2ddef26d60ad1d109bd507c':
Run finalizers before counting for StrictMode.
Craig Mautner [Tue, 25 Mar 2014 22:59:05 +0000 (22:59 +0000)]
am
452fd493: am
5332706b: am
b98ee1eb: am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
452fd49369da80a460d43fcb7e71d8549268f378':
Set ScreenshotSurface secure if any secure content is shown.
Jinsuk Kim [Tue, 25 Mar 2014 22:59:02 +0000 (22:59 +0000)]
am
1c855178: am
775a097f: am
3c34e5db: am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
1c855178e497f7ba788dadb87167f1e6735d10cb':
Add HdmiCecManager
Chris Craik [Tue, 25 Mar 2014 22:58:59 +0000 (22:58 +0000)]
am
76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants"
* commit '
76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92':
Rework Outline API, remove isolatedZVolume remnants
Craig Mautner [Tue, 25 Mar 2014 22:58:56 +0000 (22:58 +0000)]
am
f114a5c4: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
* commit '
f114a5c4d123af574dbae89befc3be61a01d1382':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Dianne Hackborn [Tue, 25 Mar 2014 22:58:53 +0000 (22:58 +0000)]
am
43111e89: Merge "Battery stats: wake locks, radio active, cleanup."
* commit '
43111e897be9f79ababb0ecf99f155695416d956':
Battery stats: wake locks, radio active, cleanup.
Will Haldean Brown [Tue, 25 Mar 2014 22:58:49 +0000 (22:58 +0000)]
am
48a5dbd3: Update current.txt for offset attributes.
* commit '
48a5dbd3cc5dd8a919983455757dc4c7b82500ab':
Update current.txt for offset attributes.
quddusc [Tue, 25 Mar 2014 22:58:45 +0000 (22:58 +0000)]
am
370cd467: am
87eac093: am
5771d425: am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
370cd4677b8ee6c8b97291b02fb0c28fd275965e':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Tue, 25 Mar 2014 22:58:40 +0000 (22:58 +0000)]
am
0d828311: am
ce6307d3: am
3ee70ca4: am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
0d828311ba0bc40245bc5a20a15258d8621f0245':
docs: Added Javadoc for Gcore Jarlsberg release.
Selim Cinek [Tue, 25 Mar 2014 22:58:37 +0000 (22:58 +0000)]
am
4c01eccb: am
38fc02d4: am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
4c01eccb0c06fb83532cad00cbf9a4b47b6dc1f8':
Disable Set Wallpaper button while loading image
Chad Brubaker [Tue, 25 Mar 2014 22:58:33 +0000 (22:58 +0000)]
am
87f738d2: am
51e93804: am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
87f738d2787444854cd15695b599b84b25027167':
Fix support for simultaneous VPN tuns
Chad Brubaker [Tue, 25 Mar 2014 22:58:30 +0000 (22:58 +0000)]
am
ff3bb2fe: am
7f623d6b: am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
Include the interface for clearDnsInterfaceForUidRange
Ricardo Cervera [Tue, 25 Mar 2014 22:58:26 +0000 (22:58 +0000)]
am
b7fe3363: am
1575e1a1: (-s ours) am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
b7fe33633b49924c35751d4e5796f8add4ad623c':
docs: Added new sensor types. Bug:
10674725
Chris Wren [Tue, 25 Mar 2014 22:58:22 +0000 (22:58 +0000)]
am
8ed3b587: Merge "add more dump info for heads up notifications"
* commit '
8ed3b587f00ccb1b4264d2ee3590af32464428c9':
add more dump info for heads up notifications
John Reck [Tue, 25 Mar 2014 22:58:19 +0000 (22:58 +0000)]
am
1e1f4d70: am
02e99e27: am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
1e1f4d705edaad3700b49c730bc8a22c522cb46b':
Eliminate mHasAlpha
Dianne Hackborn [Tue, 25 Mar 2014 22:58:16 +0000 (22:58 +0000)]
am
48600b95: Merge "Fix issue #
13564072: Back button no longer dismisses IME after voice usage"
* commit '
48600b95cad8d49772ca5634a317b893d2346f42':
Fix issue #
13564072: Back button no longer dismisses IME after voice usage
Dianne Hackborn [Tue, 25 Mar 2014 22:58:11 +0000 (22:58 +0000)]
am
7d867342: Merge "Get rid of not specifying a user errors in bluetooth."
* commit '
7d86734297bf6c2f71404498567cc92576591b8c':
Get rid of not specifying a user errors in bluetooth.
Unsuk Jung [Tue, 25 Mar 2014 22:58:07 +0000 (22:58 +0000)]
am
1d22bd19: am
8ae2ce76: am
7bde0fc7: am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
1d22bd1986ced3c5396dea83d2d04f84457953ee':
Change wallpaper sizing
Will Haldean Brown [Tue, 25 Mar 2014 22:58:04 +0000 (22:58 +0000)]
am
bdb78d82: am
ede2a729: am
ccd55a92: am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
bdb78d8261c61e8b1c30af7ff2a39cc91026aa02':
Update current.txt to include windowSwipeToDismiss
Alex Klyubin [Tue, 25 Mar 2014 22:58:00 +0000 (22:58 +0000)]
am
f96bfe86: am
7ae93b1d: am
92ec0a0c: am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
Adjust to the change in the private SSLParameterImpl API.
Jeff Sharkey [Tue, 25 Mar 2014 22:57:57 +0000 (22:57 +0000)]
am
6640f6be: am
b8846c81: am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
6640f6be412e7454bfa7d457670e83aba46ea28c':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Tue, 25 Mar 2014 22:57:54 +0000 (22:57 +0000)]
am
02893315: am
d3e33cc2: am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
0289331500457837f8ec20eea42f7bbbc2c3f479':
Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Tue, 25 Mar 2014 22:57:51 +0000 (22:57 +0000)]
am
125f2155: am
e3d4f6c1: (-s ours) am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
125f2155bedf37841d7c9a9b59fb2680e41cfcef':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Tue, 25 Mar 2014 22:57:48 +0000 (22:57 +0000)]
am
70d78bbe: Make windowSwipeToDismiss a public attribute.
* commit '
70d78bbeecc491ebb0a30ee650d2445145992514':
Make windowSwipeToDismiss a public attribute.
George Mount [Tue, 25 Mar 2014 22:57:45 +0000 (22:57 +0000)]
am
fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process."
* commit '
fea8d956649589f1cfd378571cc9ad61a92cd480':
Fix null ActivityOptions when starting an Activity in a new Process.
George Mount [Tue, 25 Mar 2014 22:57:42 +0000 (22:57 +0000)]
am
07e1b900: Merge "Fix problem on Animator with a start delay."
* commit '
07e1b9002a51032a7dc782178d3c29d3417ab266':
Fix problem on Animator with a start delay.
Przemyslaw Szczepaniak [Tue, 25 Mar 2014 22:57:39 +0000 (22:57 +0000)]
am
7638b1f3: Merge "Do not reset language in case of the TTS service reconnect."
* commit '
7638b1f3b56d8176e401a4067b18749682635f0c':
Do not reset language in case of the TTS service reconnect.
Mathew Inwood [Tue, 25 Mar 2014 22:57:36 +0000 (22:57 +0000)]
am
a73b0c54: Merge "Fix log spam from View.toString()."
* commit '
a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
Fix log spam from View.toString().
Craig Mautner [Tue, 25 Mar 2014 22:57:33 +0000 (22:57 +0000)]
am
296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
* commit '
296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
Craig Mautner [Tue, 25 Mar 2014 22:57:29 +0000 (22:57 +0000)]
am
61ada5d3: Merge "Add Activity methods for icons and labels."
* commit '
61ada5d330e10a738ba5f085cae5b9b339895d19':
Add Activity methods for icons and labels.
John Spurlock [Tue, 25 Mar 2014 22:57:26 +0000 (22:57 +0000)]
am
9ae0c8ff: Merge "Add notification category for recommendations."
* commit '
9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
Add notification category for recommendations.
Dianne Hackborn [Tue, 25 Mar 2014 22:57:23 +0000 (22:57 +0000)]
am
e9c9c441: Merge "Battery stats: track actually running time"
* commit '
e9c9c441346586e26eccc0523fcf12f5158e53f7':
Battery stats: track actually running time
Christopher Tate [Tue, 25 Mar 2014 22:57:20 +0000 (22:57 +0000)]
am
18a65ad0: Merge "Cap the size of app-defined permission trees"
* commit '
18a65ad09d9a245266874015e5aacb05d868a534':
Cap the size of app-defined permission trees
Winson Chung [Tue, 25 Mar 2014 22:57:18 +0000 (22:57 +0000)]
am
e9c77aee: Merge "Fixing crash with multiple touch pointers"
* commit '
e9c77aee60fbb781db916d32fe1db81e1d973f8f':
Fixing crash with multiple touch pointers
Matthew Williams [Tue, 25 Mar 2014 22:57:15 +0000 (22:57 +0000)]
am
cde7086b: Merge "Downgrade expedited to normal on reschedule."
* commit '
cde7086b900fd192a8e389f62ab5007d351d86b8':
Downgrade expedited to normal on reschedule.
Paul Lawrence [Tue, 25 Mar 2014 22:57:11 +0000 (22:57 +0000)]
am
717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
* commit '
717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
Don't prompt at boot if we already did that when decrypting
Jinsuk Kim [Tue, 25 Mar 2014 22:57:08 +0000 (22:57 +0000)]
Colin Cross [Tue, 25 Mar 2014 22:57:03 +0000 (22:57 +0000)]
am
8a60ded0: Merge "resolved conflicts for merge of
a67e34c8 to master"
* commit '
8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
Add HDMI-CEC service
Bo Liu [Tue, 25 Mar 2014 22:56:59 +0000 (22:56 +0000)]
am
caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"
* commit '
caf947737d3e94d2f5d839ec1fa951df7937fdb2':
Convert a attach/detach functor in ViewRootImpl to x64
Adam Cohen [Tue, 25 Mar 2014 22:56:57 +0000 (22:56 +0000)]
am
fb40d78c: Merge "Catch exceptions if Exif is malformed"
* commit '
fb40d78c57711585c9eaed467601bf3adb4f60f9':
Catch exceptions if Exif is malformed
Adam Cohen [Tue, 25 Mar 2014 22:56:54 +0000 (22:56 +0000)]
am
146af201: Merge "Catching security exception when activity destroyed"
* commit '
146af201d380cffa6a540fd0d52590bd9d30b614':
Catching security exception when activity destroyed
John Spurlock [Tue, 25 Mar 2014 22:56:51 +0000 (22:56 +0000)]
am
3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
* commit '
3daafcd7bab6e3ace72396576529e3049ab4c066':
Annotate framework vibrate calls with stream hints.
Selim Cinek [Tue, 25 Mar 2014 22:56:48 +0000 (22:56 +0000)]
am
a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"
* commit '
a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
Disable Set Wallpaper button while loading image
Craig Mautner [Tue, 25 Mar 2014 22:56:45 +0000 (22:56 +0000)]
am
f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks.
* commit '
f7ad855718dc576a1618a54035b82e92356aa0d8':
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
Selim Cinek [Tue, 25 Mar 2014 21:18:45 +0000 (21:18 +0000)]
am
50cd7c39: am
f7805dd7: am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
50cd7c39bb9f62d443a62d1f4af7f6ebc107f217':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 20:59:04 +0000 (20:59 +0000)]
Merge "resolved conflicts for merge of
c1edfc2c to master"
Zhijun He [Tue, 25 Mar 2014 20:54:55 +0000 (20:54 +0000)]
Merge "Camera2: Add partial flash state"
Gabriel Peal [Tue, 25 Mar 2014 20:49:51 +0000 (13:49 -0700)]
resolved conflicts for merge of
c1edfc2c to master
Change-Id: I95d690e5f0895c1dbfd911f345703f0f562be447
Zhijun He [Tue, 25 Mar 2014 20:49:30 +0000 (13:49 -0700)]
Camera2: Add partial flash state
Bug
13637334
Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
Adam Lesinski [Tue, 25 Mar 2014 20:49:08 +0000 (20:49 +0000)]
Merge "Shared library resource support"
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
resolved conflicts for merge of
c1edfc2c to master
attempt 2
Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
Gabriel Peal [Tue, 25 Mar 2014 19:22:41 +0000 (19:22 +0000)]
Merge "resolved conflicts for merge of
c1edfc2c to master"
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
resolved conflicts for merge of
c1edfc2c to master
Change-Id: Ica42d8ac1552040f7ea2864ff529f5fc1470001b
Adam Lesinski [Thu, 30 Jan 2014 02:20:45 +0000 (18:20 -0800)]
Shared library resource support
Shared libraries can now export resources for applications
to use.
Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.
Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.
Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.
At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.
See /tests/SharedLibrary/ for examples of a shared library and its
client.
Bug:
12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
Baligh Uddin [Tue, 25 Mar 2014 18:56:41 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:32 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:29 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
Baligh Uddin [Tue, 25 Mar 2014 18:56:24 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:22 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:56:18 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:33 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:31 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:29 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Gabriel Peal [Tue, 25 Mar 2014 18:32:22 +0000 (18:32 +0000)]
Merge "resolved conflicts for merge of
74fb97de to master"
Chris Craik [Tue, 25 Mar 2014 18:08:30 +0000 (18:08 +0000)]
Merge "Fix doc build"