OSDN Git Service
Winson Chung [Mon, 14 Jul 2014 23:29:48 +0000 (23:29 +0000)]
am
fcce9062: am
3a2891af: Fixing potential crash when attemping to read null thumbnail (Bug.
16289301)
* commit '
fcce9062e58d460ececc637a0d9f043ee3854b30':
Fixing potential crash when attemping to read null thumbnail (Bug.
16289301)
Winson Chung [Mon, 14 Jul 2014 23:15:04 +0000 (23:15 +0000)]
am
3a2891af: Fixing potential crash when attemping to read null thumbnail (Bug.
16289301)
* commit '
3a2891afa1d1cf63d2184077b39b548bd393ac67':
Fixing potential crash when attemping to read null thumbnail (Bug.
16289301)
RoboErik [Mon, 14 Jul 2014 23:09:11 +0000 (23:09 +0000)]
am
2002c9c9: am
1600b7d8: Merge changes I51f2e466,I5b67cb3e into lmp-dev
* commit '
2002c9c9f23feb2defaef6444740b0bd093ab324':
Make PlaybackState immutable with a builder
Add API to set a default session in Activity
Dake Gu [Mon, 14 Jul 2014 23:09:05 +0000 (23:09 +0000)]
am
b04e9642: am
ab8005c1: Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev
* commit '
b04e9642122f724f77a7b9fe9108d09223c76c1e':
ActivityTransition: restore callee activity shared element position
Adrian Roos [Mon, 14 Jul 2014 23:09:00 +0000 (23:09 +0000)]
am
1474df78: am
261487d8: Merge "Add strings for QS user switcher" into lmp-dev
* commit '
1474df786a1bb4862d0f2d8504ca45169321bc60':
Add strings for QS user switcher
Baligh Uddin [Mon, 14 Jul 2014 22:42:23 +0000 (22:42 +0000)]
Revert "Block focus with a touchscreen for ActionBars and Toolbars"
This reverts commit
a2933761d17bc5106357a1edd9bd3ff978160133.
Change-Id: Idedd430574925a0e86311a3d9fee51a74731c2f8
RoboErik [Mon, 14 Jul 2014 22:25:02 +0000 (22:25 +0000)]
am
1600b7d8: Merge changes I51f2e466,I5b67cb3e into lmp-dev
* commit '
1600b7d81aa2e339aff715758e52f0e4cb1a12a7':
Make PlaybackState immutable with a builder
Add API to set a default session in Activity
Dake Gu [Mon, 14 Jul 2014 22:24:43 +0000 (22:24 +0000)]
am
ab8005c1: Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev
* commit '
ab8005c15ede165822b94975f9ad4b6de52fe683':
ActivityTransition: restore callee activity shared element position
Adrian Roos [Mon, 14 Jul 2014 22:24:30 +0000 (22:24 +0000)]
am
261487d8: Merge "Add strings for QS user switcher" into lmp-dev
* commit '
261487d859a768f6c30fc8ea4b48f8b81f9e58f4':
Add strings for QS user switcher
Winson Chung [Mon, 14 Jul 2014 21:16:04 +0000 (14:16 -0700)]
Fixing potential crash when attemping to read null thumbnail (Bug.
16289301)
- Refactoring to remove unnecessary updates of RecentsConfiguration
- Removing unused logs
Change-Id: If427e565ab7260009ffb9be8ca45ba833c8262af
Svetoslav [Mon, 14 Jul 2014 21:39:27 +0000 (21:39 +0000)]
am
4af6be74: Merge "Page size not always adjusted" into lmp-dev
* commit '
4af6be748b8aab2c29e4db38da393b3d35bd0989':
Page size not always adjusted
dcashman [Mon, 14 Jul 2014 21:39:22 +0000 (21:39 +0000)]
am
1a18a06e: Merge "Initial KeySet API." into lmp-dev
* commit '
1a18a06eaa0cfcfcad4b63d9d4186735b4c6d281':
Initial KeySet API.
Colin Cross [Mon, 14 Jul 2014 21:39:18 +0000 (21:39 +0000)]
am
c6112776: Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf" into lmp-dev
* commit '
c6112776542b54e8a2a85eb0db6dedfee69a160f':
GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf
Jeff Sharkey [Mon, 14 Jul 2014 21:39:11 +0000 (21:39 +0000)]
am
5c6079a2: Merge "Pass install result message; path selection." into lmp-dev
* commit '
5c6079a245d2e909327c639841b50e57dc2a39cc':
Pass install result message; path selection.
Evan Charlton [Mon, 14 Jul 2014 21:39:05 +0000 (21:39 +0000)]
am
2a638d29: Merge "Add Intent to configure ConnectionService" into lmp-dev
* commit '
2a638d29d85507aed231df6a04a5eaac589392d2':
Add Intent to configure ConnectionService
Alan Viverette [Mon, 14 Jul 2014 21:39:01 +0000 (21:39 +0000)]
am
52a2f72e: DO NOT MERGE Remove sub-position scroller
* commit '
52a2f72ee2c188540fa1242a38bb9cf77b0e674a':
DO NOT MERGE Remove sub-position scroller
Svet Ganov [Mon, 14 Jul 2014 21:38:51 +0000 (21:38 +0000)]
am
cd24476f: Correct printer extra constant value.
* commit '
cd24476ffa314eb3b5589c1e7800929f14db86f9':
Correct printer extra constant value.
Yorke Lee [Mon, 14 Jul 2014 21:38:46 +0000 (21:38 +0000)]
am
07f62944: Merge "Add TRANSCRIPTION column to Calls table" into lmp-dev
* commit '
07f62944716836a696e46f903950a63bbba9a47e':
Add TRANSCRIPTION column to Calls table
Svet Ganov [Mon, 14 Jul 2014 21:38:32 +0000 (21:38 +0000)]
am
3cd619b6: Rename historical records if printer name changed.
* commit '
3cd619b649340764b75bc7f9b4711a18ee5f81cc':
Rename historical records if printer name changed.
Winson Chung [Mon, 14 Jul 2014 21:01:44 +0000 (21:01 +0000)]
am
7f333667: Merge "DO NOT MERGE Fixing some regressions" into lmp-dev
* commit '
7f33366793b92c8addc6b53eabf42dd538587318':
DO NOT MERGE Fixing some regressions
John Spurlock [Mon, 14 Jul 2014 21:01:40 +0000 (21:01 +0000)]
am
00319663: Volume: Delay adjustments made when showing ringer UI.
* commit '
00319663defcb6c59bc5bf510e6c38f268667e11':
Volume: Delay adjustments made when showing ringer UI.
Svet Ganov [Mon, 14 Jul 2014 21:01:32 +0000 (21:01 +0000)]
am
cc607d26: Fix broken actions in print notifications.
* commit '
cc607d26e0a3ce8b3ee7673ac5d698e9e40c5c38':
Fix broken actions in print notifications.
Svet Ganov [Mon, 14 Jul 2014 21:01:28 +0000 (21:01 +0000)]
am
10146d2e: Improve print options click to open behavior.
* commit '
10146d2e6b6777dc237ff0f48405ad486c7e121e':
Improve print options click to open behavior.
John Spurlock [Mon, 14 Jul 2014 21:01:24 +0000 (21:01 +0000)]
am
8eebd964: Merge "QS: Update rotation lock icons." into lmp-dev
* commit '
8eebd96401cb1f8a08cf992ebf008d01e71d5933':
QS: Update rotation lock icons.
Emily Bernier [Mon, 14 Jul 2014 21:01:20 +0000 (21:01 +0000)]
am
ac8a8ef3: Restore user switching logic.
* commit '
ac8a8ef347df1102d49ae097521be13cd652a7c9':
Restore user switching logic.
Jeff Brown [Mon, 14 Jul 2014 21:01:13 +0000 (21:01 +0000)]
am
bb1ecd35: Merge changes I3c19e008,I2c7c6013,I5cfd37d9 into lmp-dev
* commit '
bb1ecd35760b9e9ddc030a73d014ae9b11df17ac':
Update media session test application for new media router.
Initial draft of new MediaRouter APIs.
Delete first draft of media routing APIs.
Alexandra Gherghina [Mon, 14 Jul 2014 21:01:07 +0000 (21:01 +0000)]
am
895cf4b7: Merge "Adds hidden startActivityForResultAsUser APIs" into lmp-dev
* commit '
895cf4b76e7d697229bc0589c7646d1be815b24a':
Adds hidden startActivityForResultAsUser APIs
John Spurlock [Mon, 14 Jul 2014 21:01:03 +0000 (21:01 +0000)]
am
f5247ac0: Merge "QS: Cellular usage warning marker + policy cycle." into lmp-dev
* commit '
f5247ac02ba4d9d88d03b890e9922f1683ce65c2':
QS: Cellular usage warning marker + policy cycle.
Svet Ganov [Mon, 14 Jul 2014 21:00:54 +0000 (21:00 +0000)]
am
40e1b692: Dimming deselected preview pages
* commit '
40e1b69205bb16e35e3b6dbc4605eb2fc00eda69':
Dimming deselected preview pages
Svet Ganov [Mon, 14 Jul 2014 21:00:50 +0000 (21:00 +0000)]
am
60be71b7: Top printer not properly selected.
* commit '
60be71b7f9ede75bcdd0a3fd093257ba3c0bb0a5':
Top printer not properly selected.
Eino-Ville Talvala [Mon, 14 Jul 2014 21:00:46 +0000 (21:00 +0000)]
am
eecbafe8: Deprecate android.hardware.Camera
* commit '
eecbafe85de924a1ed6c4c3ecfcfc2353a9c6fcf':
Deprecate android.hardware.Camera
Jinsuk Kim [Mon, 14 Jul 2014 21:00:39 +0000 (21:00 +0000)]
am
cdc44875: Merge "Make sure to finish routing control action" into lmp-dev
* commit '
cdc4487582b3614637514daf08ee94175470179a':
Make sure to finish routing control action
Dongwon Kang [Mon, 14 Jul 2014 21:00:35 +0000 (21:00 +0000)]
am
b6d60a70: Merge "do not merge. Implement onVideoAvailable/Unavailable in TIF." into lmp-dev
* commit '
b6d60a70bff4491c7c597c5dc8850e41a70c1774':
do not merge. Implement onVideoAvailable/Unavailable in TIF.
Jinsuk Kim [Mon, 14 Jul 2014 21:00:27 +0000 (21:00 +0000)]
am
fa80005d: Shortens the key length in HdmiControlService
* commit '
fa80005d2415f67e62b7a1c22b87dd8aa3130e23':
Shortens the key length in HdmiControlService
John Spurlock [Mon, 14 Jul 2014 19:18:54 +0000 (19:18 +0000)]
am
2dab9ad9: QS: Introduce cast control panel.
* commit '
2dab9ad97daa7745f81fab01a905466020bc21a2':
QS: Introduce cast control panel.
Amith Yamasani [Mon, 14 Jul 2014 19:18:49 +0000 (19:18 +0000)]
am
45316d2e: Improvements to Restrictions API
* commit '
45316d2ebf8b4fb198d68c74c5bb94e9431bcc3d':
Improvements to Restrictions API
Wink Saville [Mon, 14 Jul 2014 19:18:43 +0000 (19:18 +0000)]
am
c6ec0c84: Telephony: Introduce config item for Hot Swap support
* commit '
c6ec0c845a4d66f89acf77e9f3e5a4016b6390ae':
Telephony: Introduce config item for Hot Swap support
Wink Saville [Mon, 14 Jul 2014 19:18:39 +0000 (19:18 +0000)]
am
c2b3a52b: Unhide isSmsCapable.
* commit '
c2b3a52be6f37a09843a1ccfdf377dde04901836':
Unhide isSmsCapable.
Narayan Kamath [Mon, 14 Jul 2014 19:18:35 +0000 (19:18 +0000)]
am
beaf9be6: Merge "Unhide Build.SUPPORTED_ABIS and friends."
* commit '
beaf9be6bab5dbbc96929c5b66847e7b49fcda12':
Unhide Build.SUPPORTED_ABIS and friends.
Jeff Sharkey [Mon, 14 Jul 2014 19:18:28 +0000 (19:18 +0000)]
am
847712f4: Merge "Package installation listener events."
* commit '
847712f4e7a4614bd350a85b3d60113db002255a':
Package installation listener events.
Alan Viverette [Mon, 14 Jul 2014 19:18:04 +0000 (19:18 +0000)]
am
f2e70fee: Merge "Specify light and shadow properties in theme"
* commit '
f2e70fee223f08ce8f986f5d1b6dbeb018561e84':
Specify light and shadow properties in theme
Jae Seo [Mon, 14 Jul 2014 19:18:00 +0000 (19:18 +0000)]
am
95bc3e9a: Merge "TIF: Add a way to enable/disable caption"
* commit '
95bc3e9a004c19cf48ea46009de58a61e62bf3e4':
TIF: Add a way to enable/disable caption
Adam Powell [Mon, 14 Jul 2014 19:17:56 +0000 (19:17 +0000)]
am
eb61f0f4: Updated "with-default" layout added for ResolverActivity
* commit '
eb61f0f47e0be8361cd6269281908e303152dac9':
Updated "with-default" layout added for ResolverActivity
Jeff Sharkey [Mon, 14 Jul 2014 19:17:52 +0000 (19:17 +0000)]
am
b525f6c2: Merge "Surface detailed error messages from PMS."
* commit '
b525f6c22425524da82b8fbaf4581ef7acd78844':
Surface detailed error messages from PMS.
John Spurlock [Mon, 14 Jul 2014 19:17:47 +0000 (19:17 +0000)]
am
871e64fe: QS: Introduce bluetooth control panel.
* commit '
871e64feedad3851ab7a4e2c264bb00abbb12455':
QS: Introduce bluetooth control panel.
Lajos Molnar [Mon, 14 Jul 2014 19:17:43 +0000 (19:17 +0000)]
Naveen Kumar Ponnusamy [Mon, 14 Jul 2014 19:17:24 +0000 (19:17 +0000)]
am
f73a8709: Added a test for HEVC playback memory usage
* commit '
f73a8709a3228e128191ee4ea54e35d2ca316bd7':
Added a test for HEVC playback memory usage
Derek Tan [Mon, 14 Jul 2014 19:17:19 +0000 (19:17 +0000)]
am
396e6ea3: Merge "Allow 1st party app to set Line 1 number for display purpose."
* commit '
396e6ea3bdfa78383fd6a02e9b4c9afe37af7157':
Allow 1st party app to set Line 1 number for display purpose.
Lajos Molnar [Mon, 14 Jul 2014 19:17:15 +0000 (19:17 +0000)]
am
9b3fa2de: add utility methods to util.Range, Rational and Size
* commit '
9b3fa2de42bb77eab31ce6a76aa7715ec136c77e':
add utility methods to util.Range, Rational and Size
dcashman [Mon, 14 Jul 2014 19:17:10 +0000 (19:17 +0000)]
am
0f11491d: Merge "Revert "Initial KeySet API.""
* commit '
0f11491dd87e527766c5324c3bc9aeeed57fa690':
Revert "Initial KeySet API."
Derek Tan [Mon, 14 Jul 2014 19:17:05 +0000 (19:17 +0000)]
am
977991f3: Merge "Different Mobile Network Settings screen for Nova multi-profile SIMs."
* commit '
977991f384d9026c1d5d3784aca0dc0ed9dfba8f':
Different Mobile Network Settings screen for Nova multi-profile SIMs.
dcashman [Mon, 14 Jul 2014 19:17:01 +0000 (19:17 +0000)]
am
74023057: Merge "Initial KeySet API."
* commit '
740230577a37984ee39a2b7baeb87c743af1f1bf':
Initial KeySet API.
Ye Wen [Mon, 14 Jul 2014 19:16:56 +0000 (19:16 +0000)]
am
d430da64: New SMS and MMS APIs and semantics (1/4)
* commit '
d430da649cbbcf924fc8cd1152a89b6d23cdbc26':
New SMS and MMS APIs and semantics (1/4)
Alan Viverette [Mon, 14 Jul 2014 19:16:53 +0000 (19:16 +0000)]
am
8ce5c32a: Fix switch text position when thumb is null
* commit '
8ce5c32a37db3c6c5182047053ee0651fc93eff2':
Fix switch text position when thumb is null
Tadashi G. Takaoka [Mon, 14 Jul 2014 19:16:49 +0000 (19:16 +0000)]
am
41020598: Make InputMethodUtils.getLanguageFromLocaleString public
* commit '
41020598ff45370c8441163d879842e3c6550238':
Make InputMethodUtils.getLanguageFromLocaleString public
Robert Shih [Mon, 14 Jul 2014 19:16:45 +0000 (19:16 +0000)]
am
578badfb: Merge "MediaRecorder: use fd from RandomAccessFile"
* commit '
578badfbb7650f84a243d5bd4ab7490d155acf9f':
MediaRecorder: use fd from RandomAccessFile
Robert Shih [Mon, 14 Jul 2014 19:16:41 +0000 (19:16 +0000)]
am
8a41acbb: Merge "MediaPlayer: added getSelectedTrack"
* commit '
8a41acbbf522bf9aa3a0dbb930c854f589833fa3':
MediaPlayer: added getSelectedTrack
Sailesh Nepal [Mon, 14 Jul 2014 19:16:36 +0000 (19:16 +0000)]
am
7c3fa4c7: Misc Telecomm API changes
* commit '
7c3fa4c7af1f8cbde12a4dfd23aebb809e8e3dde':
Misc Telecomm API changes
Chong Zhang [Mon, 14 Jul 2014 19:16:32 +0000 (19:16 +0000)]
am
433f1332: MediaCodec: change onError cb to send CodecException
* commit '
433f1332b273498a6bc268dbf6923a9a6a290b34':
MediaCodec: change onError cb to send CodecException
Winson Chung [Mon, 14 Jul 2014 19:16:28 +0000 (19:16 +0000)]
am
87e3cf41: Merge "Adding missing passthrough of task affiliate id."
* commit '
87e3cf419019cb330816bb4f063974ab15b0bcca':
Adding missing passthrough of task affiliate id.
Winson Chung [Mon, 14 Jul 2014 19:16:24 +0000 (19:16 +0000)]
am
d63fdd52: Merge "Piping through task affiliation to Recents."
* commit '
d63fdd52cb9721c37922837da8e1d084bf3887a3':
Piping through task affiliation to Recents.
Yuncheol Heo [Mon, 14 Jul 2014 19:16:20 +0000 (19:16 +0000)]
am
31d92474: Add the system feature for HDMI-CEC.
* commit '
31d92474638227b63b17a2d0984e83abc7dac45f':
Add the system feature for HDMI-CEC.
Chris Craik [Mon, 14 Jul 2014 19:16:11 +0000 (19:16 +0000)]
am
d15c3bd8: Merge "Disable setOutline() functionality, pending full removal"
* commit '
d15c3bd840b4a4f7a7a76372d5752d86a5fd3d63':
Disable setOutline() functionality, pending full removal
Lajos Molnar [Mon, 14 Jul 2014 19:16:06 +0000 (19:16 +0000)]
am
e89dbede: MediaCodec: add new buffer and format APIs
* commit '
e89dbede0aa17df228fff649f956900066b4ac2b':
MediaCodec: add new buffer and format APIs
Sreeram Ramachandran [Mon, 14 Jul 2014 19:16:02 +0000 (19:16 +0000)]
am
1f66a4e6: Remove unnecessary code and APIs.
* commit '
1f66a4e632df31f6e7b718c48dbc8b1d806b05c0':
Remove unnecessary code and APIs.
Colin Cross [Mon, 14 Jul 2014 19:15:58 +0000 (19:15 +0000)]
am
460ebf50: Merge "Revert "New SMS and MMS APIs and semantics (1/4)""
* commit '
460ebf5031435ec5e8747215dfc8b1e28508845a':
Revert "New SMS and MMS APIs and semantics (1/4)"
Lajos Molnar [Mon, 14 Jul 2014 19:15:55 +0000 (19:15 +0000)]
am
47dbf7e7: media: add crop rectangle to Image
* commit '
47dbf7e763cccafdf39e7b55b0f9bcebabac3e32':
media: add crop rectangle to Image
Jungshik Jang [Mon, 14 Jul 2014 19:15:51 +0000 (19:15 +0000)]
am
e0b23c67: Start system audio initialization mode on new device discovery.
* commit '
e0b23c67988fbd45d260ff71f5db0d06a1318e9f':
Start system audio initialization mode on new device discovery.
Jinsuk Kim [Mon, 14 Jul 2014 19:15:47 +0000 (19:15 +0000)]
am
d21aadca: Store active source/active port in HdmiControlService when disabled
* commit '
d21aadcac50d6bd30107590c5e4fee1711167c8d':
Store active source/active port in HdmiControlService when disabled
Jinsuk Kim [Mon, 14 Jul 2014 19:15:42 +0000 (19:15 +0000)]
am
79ed575b: Keep preferred address for HdmiControlService
* commit '
79ed575b7809b3d4fa395d4a7c7efa1c63a48c29':
Keep preferred address for HdmiControlService
dcashman [Mon, 14 Jul 2014 19:15:38 +0000 (19:15 +0000)]
am
1ef46ec7: Merge "Remove KeySetManagerService lock."
* commit '
1ef46ec73e5893b815aee480b1cf93ebeeeb7aa4':
Remove KeySetManagerService lock.
Adam Powell [Mon, 14 Jul 2014 19:15:32 +0000 (19:15 +0000)]
am
2e4f8306: Merge "Correctly set the window callback for ToolbarActionBar"
* commit '
2e4f830677e675d947e0324415bc725be636d860':
Correctly set the window callback for ToolbarActionBar
Winson Chung [Mon, 14 Jul 2014 19:15:28 +0000 (19:15 +0000)]
am
432c25aa: Initial changes to support lock-to-app on the foremost task. (Bug
16221876)
* commit '
432c25aaa410e7d99fcc7e2d2f1d8ae0a4937251':
Initial changes to support lock-to-app on the foremost task. (Bug
16221876)
Jeff Sharkey [Mon, 14 Jul 2014 19:15:24 +0000 (19:15 +0000)]
am
f0a0dabe: Merge "Progress toward installer public API: callbacks."
* commit '
f0a0dabe8f38989b49e2f28173423093c5d596fb':
Progress toward installer public API: callbacks.
Ye Wen [Mon, 14 Jul 2014 19:15:19 +0000 (19:15 +0000)]
am
f0dff59a: New SMS and MMS APIs and semantics (1/4)
* commit '
f0dff59af4a1566d8d8bd997d059fcb9dddf2cb4':
New SMS and MMS APIs and semantics (1/4)
Jeff Sharkey [Mon, 14 Jul 2014 19:15:15 +0000 (19:15 +0000)]
am
1c4b633d: Merge "ITelphony.aidl: Rename hasCarrierPrivileges for packages to checkCarrierPrivilegesForPackage."
* commit '
1c4b633d3ec76cb2b61a74ad72cc126277963b35':
ITelphony.aidl: Rename hasCarrierPrivileges for packages to checkCarrierPrivilegesForPackage.
Etan Cohen [Mon, 14 Jul 2014 19:15:11 +0000 (19:15 +0000)]
am
1959d877: IMS: Add Config interface to get/set IMS service/capabilities
* commit '
1959d87744a24163fbd0e6bed015b8df3fbc255e':
IMS: Add Config interface to get/set IMS service/capabilities
Adam Powell [Mon, 14 Jul 2014 19:15:04 +0000 (19:15 +0000)]
am
d4ca69be: Add ViewGroup#getClipToPadding()
* commit '
d4ca69be9af4b8371f15bdbf2750cf731a98918e':
Add ViewGroup#getClipToPadding()
Yuncheol Heo [Mon, 14 Jul 2014 19:14:57 +0000 (19:14 +0000)]
am
72c3c721: Merge "Handle TODO in SystemAudioActionFromTv."
* commit '
72c3c7218d79a57b019583454be45e70438d7114':
Handle TODO in SystemAudioActionFromTv.
Alan Viverette [Mon, 14 Jul 2014 19:14:50 +0000 (19:14 +0000)]
am
85c9f08f: Remove old listener when rebinding SwitchPreference
* commit '
85c9f08fae4a3173672b76137e3b6379208b4567':
Remove old listener when rebinding SwitchPreference
destradaa [Mon, 14 Jul 2014 19:14:45 +0000 (19:14 +0000)]
am
5fc6961e: Add support in the platform for Activity Recognition Hardware.
* commit '
5fc6961e3a23ffc044beeefb7a1b2976a81edea3':
Add support in the platform for Activity Recognition Hardware.
John Spurlock [Mon, 14 Jul 2014 19:14:39 +0000 (19:14 +0000)]
am
177d3f98: Merge "Volume: Extend the volume dialog timeout for notifications."
* commit '
177d3f982973488190a6d8b54ded64c74455a77c':
Volume: Extend the volume dialog timeout for notifications.
Junda Liu [Mon, 14 Jul 2014 19:14:34 +0000 (19:14 +0000)]
am
40422e9a: Merge "Add hidden systemapi hasCarrierPrivileges(pkgname)."
* commit '
40422e9a60a48738a64d2916c243f9e04ce98d67':
Add hidden systemapi hasCarrierPrivileges(pkgname).
Svetoslav [Mon, 14 Jul 2014 19:14:28 +0000 (19:14 +0000)]
am
2ced83be: Adding back accidentally removed constants
* commit '
2ced83be69527bbc91fa05c13a06709785c67219':
Adding back accidentally removed constants
Sreeram Ramachandran [Mon, 14 Jul 2014 19:14:23 +0000 (19:14 +0000)]
am
1953eca2: Merge "Delete unused APIs in NetworkManagementService."
* commit '
1953eca28076134648183744dc96ee9464ad2199':
Delete unused APIs in NetworkManagementService.
Svetoslav [Mon, 14 Jul 2014 19:14:17 +0000 (19:14 +0000)]
am
c7beab5d: Remove commented out dead code
* commit '
c7beab5de196be124fe717962ca9844e88aa35e1':
Remove commented out dead code
Fabrice Di Meglio [Mon, 14 Jul 2014 19:14:12 +0000 (19:14 +0000)]
am
c3b52889: Fix TimePicker behavior
* commit '
c3b528898371119444c76929925c7f360914544c':
Fix TimePicker behavior
Lajos Molnar [Mon, 14 Jul 2014 19:14:06 +0000 (19:14 +0000)]
am
e70111ca: MediaCodec: update documentation on buffer metadata.
* commit '
e70111caeeb81706005352f3f2b4e63880165add':
MediaCodec: update documentation on buffer metadata.
Tim Murray [Mon, 14 Jul 2014 19:14:01 +0000 (19:14 +0000)]
am
5cb79417: Merge "Fix broken blend intrinsic."
* commit '
5cb794175b76758d29848945fe9c2a33841b90fb':
Fix broken blend intrinsic.
Alan Viverette [Mon, 14 Jul 2014 02:00:01 +0000 (19:00 -0700)]
DO NOT MERGE Remove sub-position scroller
BUG:
14477472
Change-Id: I019c58dedb383e9e906831c8e44bab8b88e92604
(cherry picked from commit
66072fe0e1494a851e54bc7756734141dfbf4fe0)
Adrian Roos [Mon, 14 Jul 2014 20:57:44 +0000 (20:57 +0000)]
Merge "Add strings for QS user switcher" into lmp-dev
Adrian Roos [Mon, 14 Jul 2014 20:39:54 +0000 (22:39 +0200)]
Add strings for QS user switcher
Bug:
15545213
Change-Id: Iec98b704cd4b662d3cc5ff0b76671d44f93837d5
Dake Gu [Mon, 14 Jul 2014 21:16:55 +0000 (21:16 +0000)]
Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev
Dake Gu [Sat, 12 Jul 2014 00:48:37 +0000 (17:48 -0700)]
ActivityTransition: restore callee activity shared element position
Move the shared element of callee activity to animation start position,
then restore the measured size and locations to original values before
call requestLayout(), this fixes cases for RecyclerView optimized layout
which offsets siblings by delta of measure size.
Change-Id: I6e43c036e26986605ff008aba476e30ebd270fd1
Svetoslav [Mon, 14 Jul 2014 20:34:33 +0000 (20:34 +0000)]
Merge "Page size not always adjusted" into lmp-dev
Svetoslav [Mon, 14 Jul 2014 20:31:19 +0000 (13:31 -0700)]
Page size not always adjusted
A user can select the pages to print by selecting a range from the
UI after which the selected pages appear in the preview list. Now
the user can further prune pages by clicking on them. If the number
of pages change to two or one the page position and size were not
adjusted. Now after the constraints of desected by clicking pages
are propafated the page size position is also computed.
bug:
16297811
Change-Id: I62c0ae8ab5b1d91b120cbf9faa9653ef4ccbd97f
dcashman [Mon, 14 Jul 2014 20:02:28 +0000 (20:02 +0000)]
Merge "Initial KeySet API." into lmp-dev
dcashman [Mon, 9 Jun 2014 16:27:54 +0000 (09:27 -0700)]
Initial KeySet API.
Previously submitted but reverted due to doc-compilation bug.
Bug:
6967056
Change-Id: I9bd7ef299a4c92c4b327f5b5d7e951f0753b4c8a
Sailesh Nepal [Mon, 14 Jul 2014 22:38:03 +0000 (22:38 +0000)]
Merge "Remove CallServiceProvider and CallServiceDescriptor"
Svetoslav [Mon, 14 Jul 2014 21:44:50 +0000 (21:44 +0000)]
am
a4b233ff: am
4af6be74: Merge "Page size not always adjusted" into lmp-dev
* commit '
a4b233fface4f1d621074a528af46a1c6a2effa0':
Page size not always adjusted