OSDN Git Service
Rich Slogar [Tue, 12 May 2015 21:24:54 +0000 (21:24 +0000)]
am
138ab381: am
e12c404a: am
35d7cd40: am
d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit '
138ab38141614e28a5936b3cefcfc6607ec30dcf':
docs: providing resources link
John Spurlock [Tue, 12 May 2015 21:24:10 +0000 (21:24 +0000)]
am
bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev
* commit '
bc1a2ad8785415d1a4f86b3e477ff16e2e68f795':
Zen: Maintain source filters for both calls and messages.
Chih-Hung Hsieh [Tue, 12 May 2015 21:23:53 +0000 (21:23 +0000)]
am
57bbb8d6: Merge "Remove unused aapt target." into mnc-dev
* commit '
57bbb8d6812bcb0813ef2530cef060e5d798033b':
Remove unused aapt target.
Amith Yamasani [Tue, 12 May 2015 21:23:27 +0000 (21:23 +0000)]
am
19343927: Merge "Permission policies are for profile and device owners" into mnc-dev
* commit '
19343927c2cce0b8dfdd1df8309ce82c3d39b0d5':
Permission policies are for profile and device owners
Jean-Luc Brouillet [Tue, 12 May 2015 21:23:07 +0000 (21:23 +0000)]
am
afa81ed0: am
79f12bb6: am
d967fcbe: am
e9f17cda: docs: Overhaul of the RenderScript reference documentation.
* commit '
afa81ed0b174eb6b81b811fac5cd5df2edb0f798':
docs: Overhaul of the RenderScript reference documentation.
Selim Cinek [Tue, 12 May 2015 21:22:59 +0000 (21:22 +0000)]
am
6da881ba: Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev
* commit '
6da881ba7d6b2b860770aabcb0daefcde85ece20':
Fixed a measuring bug when the panel was collapsed
Selim Cinek [Tue, 12 May 2015 21:22:51 +0000 (21:22 +0000)]
am
1e139e86: Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev
* commit '
1e139e86843b59839f9eb6f88466d152b7e23c03':
Enforcing the touchslop now when flinging open before intercepting
Selim Cinek [Tue, 12 May 2015 21:22:37 +0000 (21:22 +0000)]
am
1690ec8e: Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev
* commit '
1690ec8e72876459da198a7228c6591df321df64':
Fixed a bug where the notifications would jump when going to the full shade
Selim Cinek [Tue, 12 May 2015 21:22:26 +0000 (21:22 +0000)]
am
e9194b98: Merge "Extended test to support launching assist above lock screen" into mnc-dev
* commit '
e9194b98a2098a1d94957e4723eaaf7399ecf3be':
Extended test to support launching assist above lock screen
Selim Cinek [Tue, 12 May 2015 21:22:05 +0000 (21:22 +0000)]
am
6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
* commit '
6329bbceebc8c0d6de164cb693a828402542fd35':
The voice assist may now be launched above the lockscreen
Etan Cohen [Tue, 12 May 2015 21:21:18 +0000 (21:21 +0000)]
am
9c7ce8b0: Merge "Disable VT over IMS feature." into mnc-dev
* commit '
9c7ce8b0fc8e429e2524b346174cb67b59c7e175':
Disable VT over IMS feature.
Jae Seo [Tue, 12 May 2015 21:21:05 +0000 (21:21 +0000)]
am
915389d4: Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev
* commit '
915389d4b8626cb35bd752420da5d21ec98c209a':
TIF: Make all the parameters for UNRATED null
Ben Kwa [Tue, 12 May 2015 21:20:30 +0000 (21:20 +0000)]
am
e74007de: Merge "Clean up error handling in CopyService." into mnc-dev
* commit '
e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b':
Clean up error handling in CopyService.
Jorim Jaggi [Tue, 12 May 2015 21:20:21 +0000 (21:20 +0000)]
am
570de1e0: Make sure fingerprint error messages are handled in Keyguard
* commit '
570de1e0e903f11ab74b0fd386b17494cd66ff33':
Make sure fingerprint error messages are handled in Keyguard
Chris Craik [Tue, 12 May 2015 21:19:59 +0000 (21:19 +0000)]
am
356b1777: Merge "Cleanup properties" into mnc-dev
* commit '
356b1777092e7da3ac5eae0bc94bd21e1cf9319a':
Cleanup properties
John Reck [Tue, 12 May 2015 21:19:39 +0000 (21:19 +0000)]
am
d6abbd29: Merge "Dump profile info after running test" into mnc-dev
* commit '
d6abbd29b7f453397036cf602655534bbd6c0430':
Dump profile info after running test
Pavel Zhamaitsiak [Tue, 12 May 2015 21:19:30 +0000 (21:19 +0000)]
am
b2e3b744: Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev
* commit '
b2e3b74418f7fc09f2610bc5620e748d420b5f87':
WiFi Calling: Show different operator name string in Data usage dialog.
Adrian Roos [Tue, 12 May 2015 21:19:22 +0000 (21:19 +0000)]
am
2b0eaffc: Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev
* commit '
2b0eaffc6264abb4162c089adf7089b4cfee5719':
Hide lockscreen contents from a11y while bouncer is showing
Jorim Jaggi [Tue, 12 May 2015 21:19:16 +0000 (21:19 +0000)]
am
5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
* commit '
5be4d295c08614eaf8afd012f90e5c7726bc293e':
Only enable fingerprint auth after first regular auth
John Spurlock [Tue, 12 May 2015 21:19:11 +0000 (21:19 +0000)]
am
d5304020: Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev
* commit '
d5304020b29762ce79d66c1ed3028b0ee30c68ad':
Volume A11y: Prevent auto-dismiss when feedback enabled.
Hiroshi Yamauchi [Tue, 12 May 2015 21:19:06 +0000 (21:19 +0000)]
am
95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev
* commit '
95e6c78f3f71850931f69fc562f68e0c46430981':
Fix binder force gc will block binder thread
Prabhakar Thirumoorthy [Tue, 12 May 2015 21:18:58 +0000 (21:18 +0000)]
am
5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev
* commit '
5b402fd8963e4700973597650b6992444ff8ffdd':
Update permissions on memory usage instrumentation
Ben Kwa [Tue, 12 May 2015 21:18:34 +0000 (21:18 +0000)]
am
efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from DO NOT MERGE" into mnc-dev
* commit '
efb70fd8a0a37ddd08356120fb63ff62694eaea0':
Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE
Andrew Solovay [Tue, 12 May 2015 21:17:58 +0000 (21:17 +0000)]
am
d5fb9cac: am
a4d0e528: am
d8039f04: am
79167534: am
c1174104: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
d5fb9cac87d65d59e9d2c0fa4242fb6eeb4edf6d':
Harish Mahendrakar [Tue, 12 May 2015 21:17:48 +0000 (21:17 +0000)]
am
34265cd9: media: Added MPEG2 profile/levels and tests
* commit '
34265cd94f76cc18648c310e4f120d280bf3a0a4':
media: Added MPEG2 profile/levels and tests
Tony Mantler [Tue, 12 May 2015 21:17:37 +0000 (21:17 +0000)]
am
def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted" into mnc-dev
* commit '
def4c0c49aeebccbb42d9b82901a7de81782baad':
Don't crash in StorageMeasurement if volume isn't mounted
Yang Ni [Tue, 12 May 2015 21:17:25 +0000 (21:17 +0000)]
am
102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev
* commit '
102badf834256e209e1a5f58fde1d67b8fd5ac0b':
Sanity checks in JNI code for closure creation
Raph Levien [Tue, 12 May 2015 21:17:17 +0000 (21:17 +0000)]
am
be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
* commit '
be8db119726a229ca687b99fcdb8a6a959648cd1':
Fix NPE in Html.inParagraph()
Julia Reynolds [Tue, 12 May 2015 21:16:55 +0000 (21:16 +0000)]
am
9e540a51: Merge "Fixing docs." into mnc-dev
* commit '
9e540a512281560a9b4ffc0edbe68cddaf9bc3b4':
Fixing docs.
Yorke Lee [Tue, 12 May 2015 21:16:42 +0000 (21:16 +0000)]
am
1542179b: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev
* commit '
1542179bd2bc82db31a925550b47151cf579c767':
Add hidden methods to set/get default dialer across users
John Reck [Tue, 12 May 2015 21:16:33 +0000 (21:16 +0000)]
am
fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev
* commit '
fe2f7e31be01c8c0ebcbdfb1ff8ae420f24c0ac2':
Add some basic DA unit tests
Casper Bonde [Tue, 12 May 2015 21:15:59 +0000 (21:15 +0000)]
am
424681e4: Settings UI for SIM access profile (2/2)
* commit '
424681e43e454bfcbceb863ddccb875ea57ec26f':
Settings UI for SIM access profile (2/2)
Alan Viverette [Tue, 12 May 2015 21:15:30 +0000 (21:15 +0000)]
am
261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
* commit '
261208e002775fe9a9f4e79e9f70b41852cfbe60':
Add API for obtaining changing configurations bitmask from Theme
Jean-Michel Trivi [Tue, 12 May 2015 21:14:52 +0000 (21:14 +0000)]
am
28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
* commit '
28a516280a59a81aeecbf4a68057019d59feb872':
AudioRecord JNI: use default UID / PID
Todd Kennedy [Tue, 12 May 2015 21:14:42 +0000 (21:14 +0000)]
am
3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
* commit '
3266f60ba0c2a37883446cadbfc00bb8354824d0':
Call Activity#onAttachFragment()
Kenny Guy [Tue, 12 May 2015 21:14:27 +0000 (21:14 +0000)]
am
e02b7868: Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev
* commit '
e02b7868c6c8f856a21f36569a77dab7f1cc7c78':
Call profile changed in cases were focused activity is nulled.
Svet Ganov [Tue, 12 May 2015 21:14:06 +0000 (21:14 +0000)]
am
4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
* commit '
4a64b19f239b6bff82a032329ce5781681843044':
Permission UI - legacy apps support
John Reck [Tue, 12 May 2015 21:13:44 +0000 (21:13 +0000)]
am
c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev
* commit '
c64b3fab95cff6f33cba524f1b9c540cfb75c73b':
Attempt to solve the double-GC problem
John Spurlock [Tue, 12 May 2015 21:13:34 +0000 (21:13 +0000)]
am
0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
* commit '
0bc8afff7eb3b5af72b7e9a4ce3954488bfbecd0':
Zen: Remove calendar rule attendance attribute.
Seigo Nonaka [Tue, 12 May 2015 21:12:54 +0000 (21:12 +0000)]
am
d4474cb9: Remove dead code from IMMS.
* commit '
d4474cb9454c7a8b907c0be07236ffed4ecf3fd8':
Remove dead code from IMMS.
Dirk Dougherty [Tue, 12 May 2015 21:12:44 +0000 (21:12 +0000)]
am
08e474ca: am
08c72b91: am
ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
* commit '
08e474ca24c024be29ed8a593cbd2748abde44ce':
Doc change: merge landing page and header/footer designs.
Rich Slogar [Tue, 12 May 2015 21:11:46 +0000 (21:11 +0000)]
am
703b5f89: am
2f626153: am
39220a7e: am
023901c6: am
ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
* commit '
703b5f895d8be08d795ace72c74576e1e4b6c5b6':
docs: Update Eclipse migrate procedure
Andrew Solovay [Tue, 12 May 2015 21:11:39 +0000 (21:11 +0000)]
am
3e51aa39: am
168bbcef: am
65241c66: am
9ceea140: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
3e51aa39818e896d8ada9820ebb4c4bc30d81e57':
Docs: New swipe-to-refresh training guide.
Prerepa Viswanadham [Tue, 12 May 2015 21:11:08 +0000 (21:11 +0000)]
am
d1808401: Merge changes from topic \'mwd-merge-050415\' into mnc-dev
* commit '
d1808401ca3bfd6b6b9a975c1e739b194d18f849': (62 commits)
Clarifying which receiver method to call.
SystemUI strings: prospective VPN strings for apps
Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Adjust display inversion matrix to account for luminance
Import translations. DO NOT MERGE
Add a libbase static depedency for aapt2.
Add a libbase static depedency for aapt2.
Add a static dependency on libbase.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix build
Properly describe exception
Expand the notification panel by Meta-N.
DO NOT MERGE - Make sure to return network type after conversion
DO NOT MERGE - Radio Access Family related fixes
DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same.
Fix incorrect getType signature/implementation in doc.
Add plumbing for merge failures and renable button. (3/4)
Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
...
Fabrice Di Meglio [Tue, 12 May 2015 21:07:37 +0000 (21:07 +0000)]
am
44b60be1: Merge "Add user selectable Default Browser feature - part 5" into mnc-dev
* commit '
44b60be189183138437a3faf9a73388af0efcf44':
Add user selectable Default Browser feature - part 5
Adam Lesinski [Tue, 12 May 2015 21:07:30 +0000 (21:07 +0000)]
am
5b151690: Merge "AAPT2: Add option to generate static library" into mnc-dev
* commit '
5b1516900ac23fbbc32c3fee36009e1dd3569dcd':
AAPT2: Add option to generate static library
Adam Lesinski [Tue, 12 May 2015 21:07:22 +0000 (21:07 +0000)]
am
f713aa2f: Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev
* commit '
f713aa2f10ea01fab302536a87bd0521b915cb05':
AAPT2: Include package name of attributes in styleable from another package
Adam Lesinski [Tue, 12 May 2015 21:07:13 +0000 (21:07 +0000)]
am
247bc95c: Merge "AAPT2: Record public status in a more robust way" into mnc-dev
* commit '
247bc95cb31c6f7e56814818dc29aa1eb8512e6c':
AAPT2: Record public status in a more robust way
Adam Lesinski [Tue, 12 May 2015 21:06:59 +0000 (21:06 +0000)]
am
2f519532: Merge "Add namespace handling in attribute values" into mnc-dev
* commit '
2f519532eecd881b034a4e31f57336724604cb56':
Add namespace handling in attribute values
Jorim Jaggi [Tue, 12 May 2015 21:06:40 +0000 (21:06 +0000)]
am
f31a7003: Merge "Update emergency call button label when language changes" into mnc-dev
* commit '
f31a7003643988c7e2682a4f9256a28b04877035':
Update emergency call button label when language changes
Robert Shih [Tue, 12 May 2015 21:06:18 +0000 (21:06 +0000)]
am
5eac1da3: Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev
* commit '
5eac1da3bbd513f6b5204454afa09c8d6c3c9c06':
MediaPlayer: setSubtitleAnchor on a HandlerThread
Jorim Jaggi [Tue, 12 May 2015 21:05:56 +0000 (21:05 +0000)]
am
9f74303e: Track unlock attempts per user.
* commit '
9f74303eb8432aa64a7030f58ab0c3279a20c53e':
Track unlock attempts per user.
Andre Eisenbach [Tue, 12 May 2015 21:05:37 +0000 (21:05 +0000)]
am
ab258139: BluetoothSap class should not be public
* commit '
ab2581398c812917145088590bd18eb83f3a2ea6':
BluetoothSap class should not be public
Wei Jia [Tue, 12 May 2015 21:05:20 +0000 (21:05 +0000)]
am
73b4a330: Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev
* commit '
73b4a3303ed97860d4a4c0795afd680aa5158d4e':
MediaSync: clean up configureAudioTrack and configureSurface.
Joe Fernandez [Tue, 12 May 2015 21:05:11 +0000 (21:05 +0000)]
am
2dc05e22: am
722b509d: am
a246d2dd: am
9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
* commit '
2dc05e22bdbebe3f276391a743f525b0e1a2504e':
docs: Android Developer Dashboard update - May 2015
Rich Slogar [Tue, 12 May 2015 21:05:02 +0000 (21:05 +0000)]
Dirk Dougherty [Tue, 12 May 2015 21:04:50 +0000 (21:04 +0000)]
am
41ef6ba4: am
fd92db9c: am
35219b7d: am
b42c5f80: Update N6 device art port image to remove shadow.
* commit '
41ef6ba4ce330718c71db503788943067b5b62a9':
Update N6 device art port image to remove shadow.
Rich Slogar [Tue, 12 May 2015 21:04:40 +0000 (21:04 +0000)]
am
d5aa39cc: am
5bf92cba: am
ffac3c82: am
67a05f0c: am
e7bfe5b3: docs: sdk 24.2.0 revisions
* commit '
d5aa39cc0aab9b6175ebafd87eed6894ac4d949f':
docs: sdk 24.2.0 revisions
Joe Fernandez [Tue, 12 May 2015 21:04:29 +0000 (21:04 +0000)]
am
ed4331d2: am
419aff0f: am
ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs
* commit '
ed4331d29a63b30293bb2176712c491c65190623':
docs: M Preview mini site skeleton
George Mount [Tue, 12 May 2015 21:04:09 +0000 (21:04 +0000)]
am
57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev
* commit '
57436d3f7e7fca99400a9b90e93491e892d135ae':
Fix potential NPE in internal isValidTarget method.
Andre Eisenbach [Tue, 12 May 2015 21:03:56 +0000 (21:03 +0000)]
am
f455986a: Add documentation for BluetoothSocket.getConnectionType()
* commit '
f455986a45328614c8dd07a4d60a30b9ddc3d994':
Add documentation for BluetoothSocket.getConnectionType()
George Mount [Tue, 12 May 2015 21:03:47 +0000 (21:03 +0000)]
am
c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev
* commit '
c81af1ca7838f79ecc39fe0a9bf269880fa515e5':
When returning, transition only existing shared elements.
Chris Wren [Tue, 12 May 2015 21:03:39 +0000 (21:03 +0000)]
am
0425de31: Merge "eliminate notification clicker garbage." into mnc-dev
* commit '
0425de31cf9a2ad8e5883c64d27dc2ee90d0377c':
eliminate notification clicker garbage.
Sanket Padawe [Tue, 12 May 2015 21:03:30 +0000 (21:03 +0000)]
am
5c33a2e3: Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev
* commit '
5c33a2e3ecf3c495e00614029df917e0754d7397':
Adding "Connected, no Internet" string in Wifi nw summary.
George Mount [Tue, 12 May 2015 21:03:20 +0000 (21:03 +0000)]
am
61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev
* commit '
61bab469a1529ef61cadb870ca4cc533a5510cfb':
Fix Visibility not changing until Animator ends.
Alan Viverette [Tue, 12 May 2015 21:03:11 +0000 (21:03 +0000)]
am
394f9360: Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev
* commit '
394f9360c91c588fb1630f2d6af65fabe4c241a6':
More documentation for handling RippleDrawable mask at run time
Fabrice Di Meglio [Tue, 12 May 2015 21:03:02 +0000 (21:03 +0000)]
am
8ef631de: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
* commit '
8ef631de47d4e52cafe5f9182633892b480dfcdb':
Add user selectable Default Browser feature - part 4
Alan Viverette [Tue, 12 May 2015 21:02:54 +0000 (21:02 +0000)]
am
d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev
* commit '
d38d3574d0b1905d41891c2d7f89892ab13803ae':
Always force constructors accessible during inflation
John Spurlock [Tue, 12 May 2015 21:02:45 +0000 (21:02 +0000)]
am
ad2399f3: Merge "Zen: Implement calendar event system condition provider." into mnc-dev
* commit '
ad2399f3be4861d0f5acf072460d98fafc951c57':
Zen: Implement calendar event system condition provider.
Jeff Sharkey [Tue, 12 May 2015 21:02:38 +0000 (21:02 +0000)]
am
5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev
* commit '
5f809e3fff2b4c6c94d966ceb93e6cf74fe9813b':
Avoid NPE when fsUuid is null.
John Reck [Tue, 12 May 2015 21:02:23 +0000 (21:02 +0000)]
am
e678b41c: Merge "Fix setName use-after-free" into mnc-dev
* commit '
e678b41cdb56847c094260607ea39aea4abb808e':
Fix setName use-after-free
Jose Lima [Tue, 12 May 2015 21:02:05 +0000 (21:02 +0000)]
am
5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
* commit '
5551aca2b8ec9fe7ab5ffda8dad82ee104556962':
Move ContentInfoExtender from Notification.java to a support library
Steve McKay [Tue, 12 May 2015 21:01:55 +0000 (21:01 +0000)]
am
5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev
* commit '
5d2c1d54b953ac0e4243210237fec92e3105844e':
Ensure sort menu is shown as needed.
Geoff Mendal [Tue, 12 May 2015 21:01:47 +0000 (21:01 +0000)]
am
cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
Import translations. DO NOT MERGE
Rich Slogar [Wed, 6 May 2015 01:13:28 +0000 (01:13 +0000)]
am
e12c404a: am
35d7cd40: am
d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit '
e12c404a07037d214c7f1f83d993ce9dba95e47b':
docs: providing resources link
Rich Slogar [Wed, 6 May 2015 00:58:49 +0000 (00:58 +0000)]
am
35d7cd40: am
d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit '
35d7cd40bb167ee08bbb855195eb395e77a05b7a':
docs: providing resources link
Rich Slogar [Wed, 6 May 2015 00:50:57 +0000 (00:50 +0000)]
am
d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit '
d0551feed28614dad957a09998522b25392ce621':
docs: providing resources link
John Spurlock [Wed, 6 May 2015 00:30:24 +0000 (00:30 +0000)]
Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev
Chih-Hung Hsieh [Wed, 6 May 2015 00:29:23 +0000 (00:29 +0000)]
Merge "Remove unused aapt target." into mnc-dev
Amith Yamasani [Wed, 6 May 2015 00:18:18 +0000 (00:18 +0000)]
Merge "Permission policies are for profile and device owners" into mnc-dev
Amith Yamasani [Wed, 6 May 2015 00:16:18 +0000 (17:16 -0700)]
Permission policies are for profile and device owners
Not just device owners
Change-Id: I78ad815651e9bdc4bd78e61d634a5067935fa33f
Chih-Hung Hsieh [Mon, 4 May 2015 21:10:13 +0000 (14:10 -0700)]
Remove unused aapt target.
BUG:
20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
(cherry picked from AOSP commit
97627314a4d3e114afe3dbd764a51523e9f0b787)
Jean-Luc Brouillet [Tue, 5 May 2015 23:58:55 +0000 (23:58 +0000)]
am
79f12bb6: am
d967fcbe: am
e9f17cda: docs: Overhaul of the RenderScript reference documentation.
* commit '
79f12bb648aa8a4f71e2c64c5c6354e2261e3257':
docs: Overhaul of the RenderScript reference documentation.
Selim Cinek [Tue, 5 May 2015 23:54:57 +0000 (23:54 +0000)]
Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:54:21 +0000 (23:54 +0000)]
Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:53:58 +0000 (23:53 +0000)]
Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:53:22 +0000 (23:53 +0000)]
Merge "Extended test to support launching assist above lock screen" into mnc-dev
Selim Cinek [Tue, 5 May 2015 23:52:34 +0000 (23:52 +0000)]
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
Rich Slogar [Tue, 5 May 2015 23:44:33 +0000 (23:44 +0000)]
Merge "docs: providing resources link" into lmp-mr1-ub-docs
Jean-Luc Brouillet [Tue, 5 May 2015 23:39:28 +0000 (23:39 +0000)]
am
d967fcbe: am
e9f17cda: docs: Overhaul of the RenderScript reference documentation.
* commit '
d967fcbee77b2872cb5ae6b05aaabbbc764f806b':
docs: Overhaul of the RenderScript reference documentation.
Etan Cohen [Tue, 5 May 2015 23:30:27 +0000 (23:30 +0000)]
Merge "Disable VT over IMS feature." into mnc-dev
Jean-Luc Brouillet [Tue, 5 May 2015 23:27:04 +0000 (23:27 +0000)]
am
e9f17cda: docs: Overhaul of the RenderScript reference documentation.
* commit '
e9f17cda80ae60818f43b4ed724436c8b88fd0db':
docs: Overhaul of the RenderScript reference documentation.
Jae Seo [Tue, 5 May 2015 23:13:20 +0000 (23:13 +0000)]
Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev
Jae Seo [Tue, 5 May 2015 20:18:17 +0000 (13:18 -0700)]
TIF: Make all the parameters for UNRATED null
UNRATED is equivalent to Java null in its meaning and usage, thus it is
not appropriate to use non-trivial strings such as "com.android.tv" and
"UNRATED" to create this constant. Replaced them with the string "null",
which is commonly used in other parts of Android and also modified the
documentation to clarify its usage.
Bug:
19102311
Change-Id: I28ac8da3584eb2cc6dfd7284e2b88873fd4e9d13
John Spurlock [Tue, 5 May 2015 22:30:28 +0000 (18:30 -0400)]
Zen: Maintain source filters for both calls and messages.
Bug:
18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22
Jean-Luc Brouillet [Fri, 24 Apr 2015 22:59:02 +0000 (15:59 -0700)]
docs: Overhaul of the RenderScript reference documentation.
cherry-pick from CL: https://android-review.googlesource.com/148241
This CL replaces the Doxygen generated documentation by one that's created
by our internal tool found in framework/rs/api. The big advantages:
- Can handle overloaded functions. Doxygen could not and RenderScript has many.
- Can have version information.
- Can match the look of the Java documentation.
- Cleaner look and no leaking of internal paths.
This CL also include changes introduced by the L release which was missing
previously.
Change-Id: Icade41d04d35e45c445ad952bb8ce14389f9f59f
Etan Cohen [Tue, 5 May 2015 22:18:07 +0000 (15:18 -0700)]
Disable VT over IMS feature.
Feature code (mostly) implemented but not final or supported in release.
Change-Id: I65c4d4400a814718c51954299ef7c993a37638e2
Ben Kwa [Tue, 5 May 2015 21:53:21 +0000 (21:53 +0000)]
Merge "Clean up error handling in CopyService." into mnc-dev
Selim Cinek [Tue, 5 May 2015 03:46:25 +0000 (20:46 -0700)]
Fixed a measuring bug when the panel was collapsed
This lead to the dismissView and other views being measured with
height 0 and therefore harm performance and animations.
Bug:
20665047
Change-Id: I985c40948994b409cea5ac7c34a711ce243c62f1
Selim Cinek [Wed, 29 Apr 2015 22:36:56 +0000 (15:36 -0700)]
Enforcing the touchslop now when flinging open before intercepting
This could lead to clicks on notifications not being recognized when opening.
Bug:
19228079
Change-Id: I02c856dd885c8e9bb228a5b20e975e27dba60d12
OSDN Git Service
