OSDN Git Service
kmccormick [Thu, 17 Jul 2014 18:14:09 +0000 (18:14 +0000)]
am
7a0ace2d: am
1f4e5686: am
289d3c25: am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
7a0ace2dd99b43f1a9f22d184893216e28dc0494':
Doc Update: new Smack sample.
David Friedman [Thu, 17 Jul 2014 18:14:05 +0000 (18:14 +0000)]
am
a4690c90: am
8b51d07f: am
a827c738: am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
a4690c90675ad821e0aafdd44e697552cd8fccea':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Sailesh Nepal [Thu, 17 Jul 2014 18:05:42 +0000 (11:05 -0700)]
resolved conflicts for merge of
03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
Christopher Tate [Thu, 17 Jul 2014 16:45:23 +0000 (16:45 +0000)]
am
c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
* commit '
c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
Jeff Sharkey [Thu, 17 Jul 2014 16:45:19 +0000 (16:45 +0000)]
am
2158503f: Merge "Install sessions only inherit APK files." into lmp-dev
* commit '
2158503ff835f60d1a39f5bac724dd90e0900403':
Install sessions only inherit APK files.
Shishir Agrawal [Thu, 17 Jul 2014 16:45:14 +0000 (16:45 +0000)]
am
38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '
38c365d037e40385f2b25cd0fe0214c24f2f08ed':
Unhiding the SMS/MMS APIs for injection/transport.
Sharvil Nanavati [Thu, 17 Jul 2014 16:45:10 +0000 (16:45 +0000)]
am
3afc825a: Launch processes running under the \'bluetooth\' uid with CAP_WAKE_ALARM.
* commit '
3afc825ae1dcbff19fa1eec345c3a0a685216fa0':
Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.
Alan Viverette [Thu, 17 Jul 2014 16:45:05 +0000 (16:45 +0000)]
am
ca27046e: Merge "Fix state list drawable transitions" into lmp-dev
* commit '
ca27046ee1fd2e23512af943177d4eb35757865b':
Fix state list drawable transitions
Fabrice Di Meglio [Thu, 17 Jul 2014 16:45:01 +0000 (16:45 +0000)]
am
fd6eeda0: Fix bug #
16309454 Broken recent button after dismissing set time dialog
* commit '
fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
Fix bug #
16309454 Broken recent button after dismissing set time dialog
Jeff Davidson [Thu, 17 Jul 2014 16:44:56 +0000 (16:44 +0000)]
am
8f406122: Remove obsolete remark from XXHDPI comment.
* commit '
8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
David Friedman [Thu, 17 Jul 2014 16:44:47 +0000 (16:44 +0000)]
am
6ec875ea: am
c6474d97: am
fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
6ec875ea49e4f3e3621a1844df3968881d5cac40':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Deepanshu Gupta [Thu, 17 Jul 2014 16:44:42 +0000 (16:44 +0000)]
am
f9c7a0ab: (-s ours) Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
* commit '
f9c7a0ab4ea11932b0710df5933b1db63f36ba81':
Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Jul 2014 16:44:38 +0000 (16:44 +0000)]
am
08f4aef0: (-s ours) Optimize Blend composites. [DO NOT MERGE]
* commit '
08f4aef0f198d52b9c67def64626ff42593ad278':
Optimize Blend composites. [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Jul 2014 16:44:34 +0000 (16:44 +0000)]
am
21b0919f: (-s ours) Add BlendComposite.java [DO NOT MERGE]
* commit '
21b0919fef8d160debe4651e414248b74cff6f29':
Add BlendComposite.java [DO NOT MERGE]
Barnaby James [Wed, 16 Jul 2014 21:27:39 +0000 (14:27 -0700)]
Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
Robert Ly [Thu, 17 Jul 2014 14:13:16 +0000 (14:13 +0000)]
am
b9a7c675: am
d2d27a5f: am
f3c3edfe: am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
b9a7c67599d2f424f2b6bc445099a893aa8433bc':
docs: add EU legal notice
Winson Chung [Thu, 17 Jul 2014 14:13:12 +0000 (14:13 +0000)]
am
a0eeb67a: am
24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug
16327074)" into lmp-dev
* commit '
a0eeb67ad97ce1d7633e0ee3153a994ae78e1861':
Don't clobber intent flags when starting recent activities anew. (Bug
16327074)
RoboErik [Thu, 17 Jul 2014 14:13:02 +0000 (14:13 +0000)]
am
22ea3c3d: am
b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '
22ea3c3ddaad1b25c05c3e6e6027747076d44750':
Change adjustVolumeBy to adjustVolume
ztenghui [Thu, 17 Jul 2014 14:12:58 +0000 (14:12 +0000)]
am
7fdb6e06: am
6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '
7fdb6e0658855bb0a3ffe78c05bf509aa73aa1d7':
Add more reverse support to AnimatedVD
RoboErik [Thu, 17 Jul 2014 14:12:53 +0000 (14:12 +0000)]
am
1cd008e1: am
9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '
1cd008e1fe13b97068c3eac86b1b78ab20dca1fb':
Make MediaSession and MediaController constructors public
Robert Ly [Thu, 17 Jul 2014 14:02:58 +0000 (14:02 +0000)]
am
d2d27a5f: am
f3c3edfe: am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
d2d27a5f8d7f641cda4a04c2fe285d17ca924226':
docs: add EU legal notice
Winson Chung [Thu, 17 Jul 2014 14:02:55 +0000 (14:02 +0000)]
am
24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug
16327074)" into lmp-dev
* commit '
24d04eebfe00e0d8346c2864d84f04b4d046b9e1':
Don't clobber intent flags when starting recent activities anew. (Bug
16327074)
RoboErik [Thu, 17 Jul 2014 14:02:50 +0000 (14:02 +0000)]
am
b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '
b21fab77c0758da3dcb2fa0029fef92df4d5902a':
Change adjustVolumeBy to adjustVolume
ztenghui [Thu, 17 Jul 2014 14:02:46 +0000 (14:02 +0000)]
am
6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '
6f5df88108b7fb6b9a59ac36f448bd23b5397ef1':
Add more reverse support to AnimatedVD
RoboErik [Thu, 17 Jul 2014 14:02:42 +0000 (14:02 +0000)]
am
9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '
9b039cf80a0c0c388ccbd8b6ece9aa5c7b970f26':
Make MediaSession and MediaController constructors public
Nicolas Prevot [Thu, 17 Jul 2014 13:17:11 +0000 (13:17 +0000)]
Merge "Remove cross-profile intent filters when removing a user."
Niels Egberts [Wed, 25 Jun 2014 12:48:32 +0000 (13:48 +0100)]
TtsSpan builders for each TtsSpan type.
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.
For now it only contains Text and Cardinal types.
Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
Nicolas Prevot [Tue, 8 Jul 2014 14:47:17 +0000 (15:47 +0100)]
Remove cross-profile intent filters when removing a user.
When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.
Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
Santos Cordon [Wed, 16 Jul 2014 23:36:41 +0000 (23:36 +0000)]
Merge "Revert "Add toString & equals helper methods to PhoneAccount.java""
Santos Cordon [Wed, 16 Jul 2014 23:36:28 +0000 (23:36 +0000)]
Revert "Add toString & equals helper methods to PhoneAccount.java"
This reverts commit
adcb1e1b8e8be5f39f5ea672f628cfcd4af19dff.
Change-Id: If8419d1a1fd90cfa2400f67e98e95258b3e38137
kmccormick [Wed, 16 Jul 2014 21:44:50 +0000 (21:44 +0000)]
am
1f4e5686: am
289d3c25: am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
1f4e56869c47a8ef68ef83b7693a0f93ad21c984':
Doc Update: new Smack sample.
David Friedman [Wed, 16 Jul 2014 21:44:41 +0000 (21:44 +0000)]
am
8b51d07f: am
a827c738: am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
8b51d07ffa87cf77b0793ee851e30da0ca8ba857':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
kmccormick [Wed, 16 Jul 2014 21:36:07 +0000 (21:36 +0000)]
am
289d3c25: am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
289d3c253eafe09a2ba3614aeeb8ba80539175b7':
Doc Update: new Smack sample.
David Friedman [Wed, 16 Jul 2014 21:36:03 +0000 (21:36 +0000)]
am
a827c738: am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
a827c7383273194c0dea1b5cc94e85285ee22afd':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
kmccormick [Wed, 16 Jul 2014 21:17:15 +0000 (21:17 +0000)]
am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
fc8a3b5f06fe725ed561fb3535efd02b16c526ea':
Doc Update: new Smack sample.
David Friedman [Wed, 16 Jul 2014 21:17:12 +0000 (21:17 +0000)]
am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
046702ba57c34893e058674dc36192796af20da7':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Sailesh Nepal [Tue, 15 Jul 2014 21:40:39 +0000 (14:40 -0700)]
TTY: frameworks/base changes
This CL makes the following changes:
1. New public APIs:
- TelecommManager.getCurrentTtyMode: This is used to
get current TTY mode. It's used by Telephony to set
the phone state before calls are created (which is why
it can't be a Conneciton API).
- TelecommConstants.TTY_MODE_*: These are constants
copied from Phone.java
- TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED: This
action is fired when the current TTY mode changes.
Apps can listen to this before and during a call.
The old version of this was in TtyIntent.java which
I deleted.
2. New private API
- TelecommManager.isTtySupported: This is used by
Telephony to hide the TTY settings on devices
that don't support TTY
3. Various updates to use the constants renamed in this CL
Change-Id: I652b095af30cc2732a06829dc23492e5355660da
Sharvil Nanavati [Mon, 30 Jun 2014 00:06:52 +0000 (17:06 -0700)]
Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.
This is required since bluedroid needs to set wake alarms and timers.
Going through JNI back into Java code and then across Binder to
AlarmManager is both inefficient and doesn't provide the resolution
required for functions like A2DP.
Change-Id: I619be0b18a9e7ac2567b7c68ba84fcd15eecf715
Fabrice Di Meglio [Wed, 16 Jul 2014 01:47:10 +0000 (18:47 -0700)]
Fix bug #
16309454 Broken recent button after dismissing set time dialog
- correct set and use the Canceled state
Change-Id: Id60ae14c493254193ee677b66388a64a49618273
Jeff Davidson [Wed, 16 Jul 2014 19:56:26 +0000 (12:56 -0700)]
Remove obsolete remark from XXHDPI comment.
XXHDPI screens now make up 15% of all Android devices, so developers
should be encouraged to include assets at this density.
Change-Id: I9d845769233a71dd954b5f35246aabb774a1c40d
David Friedman [Wed, 16 Jul 2014 19:33:55 +0000 (12:33 -0700)]
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
(cherry picked from commit
fe545cdb4e9d49d8cf58626ef77709abecf8f26b)
David Friedman [Wed, 16 Jul 2014 19:54:05 +0000 (19:54 +0000)]
am
c6474d97: am
fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
c6474d97cc11bf1dbda701efe1220f6bf6e165cf':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Deepanshu Gupta [Wed, 16 Jul 2014 01:12:14 +0000 (18:12 -0700)]
Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
Not all PorterDuff modes are supported by Java's AlphaComposite. Use
BlendComposite for such modes.
Change-Id: I51486a40f09186cf8a87ce1e6a3d1cfcf39fb2d3
(cherry picked from commit
b15709cd36d28c47660b0ae30918642bfd3d85f7)
Deepanshu Gupta [Mon, 7 Jul 2014 21:22:19 +0000 (14:22 -0700)]
Optimize Blend composites. [DO NOT MERGE]
Removed redundant array allocations to improve performance for various
blending modes.
Change-Id: Iaba1d6ff3ad03eebdc859c599b610cc593370438
(cherry picked from commit
9ce074610413ce3a5dd0cef9295f0ae9061402b7)
Deepanshu Gupta [Mon, 7 Jul 2014 17:35:15 +0000 (10:35 -0700)]
Add BlendComposite.java [DO NOT MERGE]
The class is adapted from a demo tool for Blending Modes written by
Romain Guy (romainguy@android.com). The tool is available at
http://www.curious-creature.org/2006/09/20/new-blendings-modes-for-java2d/
Change-Id: I8f7c7ca08d3078106056764a4e2f1ce95d990137
(cherry picked from commit
882e08759137a77090c3c7dff8cba425a3393474)
David Friedman [Wed, 16 Jul 2014 19:50:24 +0000 (19:50 +0000)]
am
fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
fe545cdb4e9d49d8cf58626ef77709abecf8f26b':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
David Friedman [Wed, 16 Jul 2014 19:33:55 +0000 (12:33 -0700)]
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
Robert Ly [Wed, 16 Jul 2014 19:32:11 +0000 (19:32 +0000)]
am
f3c3edfe: am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
f3c3edfee8d9a2148603c1082e128f8bcbe44fc0':
docs: add EU legal notice
Robert Ly [Wed, 16 Jul 2014 19:28:57 +0000 (19:28 +0000)]
am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
bafdb90070bf3f5120599efd322fdd20a31e84ef':
docs: add EU legal notice
Robert Ly [Wed, 16 Jul 2014 19:23:46 +0000 (19:23 +0000)]
am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
82088d62f81a1d842bdb2d285ed578c562b20edd':
docs: add EU legal notice
Santos Cordon [Mon, 14 Jul 2014 10:32:56 +0000 (03:32 -0700)]
Add toString & equals helper methods to PhoneAccount.java
Change-Id: I3a7eb9d1089b43c9a6b6e91e2e506970b92c3e97
Narayan Kamath [Wed, 16 Jul 2014 19:16:40 +0000 (19:16 +0000)]
am
baba92bd: Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev
* commit '
baba92bd1da887db7c3e834fe7d2a7081936aecf':
Dexopt for Context.createPackageContext when code is included.
Yorke Lee [Wed, 16 Jul 2014 19:07:37 +0000 (19:07 +0000)]
am
af195ca0: Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev
* commit '
af195ca07b7bf7452b140d7dfa226942bd947c47':
Make ContactPreferences use SharedPreferences instead of System settings (1/5)
Jean-Michel Trivi [Wed, 16 Jul 2014 18:59:37 +0000 (18:59 +0000)]
am
a880e639: Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev
* commit '
a880e639a882e88981cc40dc64147d7dc290ac01':
MediaPlayer factory method with audio attributes and session ID
Quddus Chong [Wed, 16 Jul 2014 18:33:12 +0000 (18:33 +0000)]
am
c93351fe: am
6743f1ea: am
1a2a9730: am
f0d8c6fc: Merge "docs: Fixed small typo. bug:
14617866" into klp-modular-docs
* commit '
c93351fe993dd3c4d48079bc327de1d0c310e327':
docs: Fixed small typo. bug:
14617866
Chris Smith [Wed, 16 Jul 2014 18:27:41 +0000 (18:27 +0000)]
am
64f98371: am
23a0b3d9: am
211c5844: am
7a047941: docs: Fix minor issues with Wear data events docs.
* commit '
64f98371a9565102702a343b5dc7b2ab958e9d2e':
docs: Fix minor issues with Wear data events docs.
Quddus Chong [Wed, 16 Jul 2014 18:23:27 +0000 (18:23 +0000)]
am
6743f1ea: am
1a2a9730: am
f0d8c6fc: Merge "docs: Fixed small typo. bug:
14617866" into klp-modular-docs
* commit '
6743f1ea92e8c1516774d38469511d189a1bf5eb':
docs: Fixed small typo. bug:
14617866
Chris Smith [Wed, 16 Jul 2014 18:18:59 +0000 (18:18 +0000)]
am
23a0b3d9: am
211c5844: am
7a047941: docs: Fix minor issues with Wear data events docs.
* commit '
23a0b3d9d5e77a3fe5d353339c181bf729de4ff8':
docs: Fix minor issues with Wear data events docs.
Quddus Chong [Wed, 16 Jul 2014 18:17:18 +0000 (18:17 +0000)]
am
1a2a9730: am
f0d8c6fc: Merge "docs: Fixed small typo. bug:
14617866" into klp-modular-docs
* commit '
1a2a9730e605e5a3ea46db1049bf950a669cb0d3':
docs: Fixed small typo. bug:
14617866
Quddus Chong [Wed, 16 Jul 2014 18:13:19 +0000 (18:13 +0000)]
am
f0d8c6fc: Merge "docs: Fixed small typo. bug:
14617866" into klp-modular-docs
* commit '
f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
docs: Fixed small typo. bug:
14617866
Chris Smith [Wed, 16 Jul 2014 18:13:14 +0000 (18:13 +0000)]
am
211c5844: am
7a047941: docs: Fix minor issues with Wear data events docs.
* commit '
211c58448e21ad210a497658fdf1dd26b0c96faf':
docs: Fix minor issues with Wear data events docs.
Jae Seo [Wed, 16 Jul 2014 18:12:25 +0000 (18:12 +0000)]
am
ab39b29c: Merge "Implement TvContentRating" into lmp-dev
* commit '
ab39b29ceb70802f134337989a1dc8ae11972959':
Implement TvContentRating
Chris Smith [Wed, 16 Jul 2014 18:09:17 +0000 (18:09 +0000)]
am
7a047941: docs: Fix minor issues with Wear data events docs.
* commit '
7a04794186dcb679501a7a9383caae8df01428d0':
docs: Fix minor issues with Wear data events docs.
Andrew Lee [Wed, 16 Jul 2014 18:06:02 +0000 (18:06 +0000)]
am
30004856: Merge "Adding getVideoState method to Telecomm Call\'s details." into lmp-dev
* commit '
30004856cc7e34b7e5269206b9ca278cda3355ab':
Adding getVideoState method to Telecomm Call's details.
Narayan Kamath [Wed, 16 Jul 2014 18:05:58 +0000 (18:05 +0000)]
am
093eaa8d: Temporary workaround for getApplicationInfo + multiArch.
* commit '
093eaa8d7ac1dd8f84c07852f2566d8e129177f5':
Temporary workaround for getApplicationInfo + multiArch.
Narayan Kamath [Wed, 16 Jul 2014 18:05:54 +0000 (18:05 +0000)]
am
4adbb78f: Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev
* commit '
4adbb78fa8330ea635d938af117b47a75512a504':
Adjust nativeLibraryDir for package contexts of multiArch installs.
Ye Wen [Wed, 16 Jul 2014 18:05:50 +0000 (18:05 +0000)]
am
be94a3ff: Merge "Messaging auto persist switch (1/4)" into lmp-dev
* commit '
be94a3fff7eddc1fa83be250b0e7ec6ac3f4eab8':
Messaging auto persist switch (1/4)
Narayan Kamath [Wed, 16 Jul 2014 10:06:43 +0000 (11:06 +0100)]
Temporary workaround for getApplicationInfo + multiArch.
Google play services client libraries construct native paths
using pm.getApplicationInfo().nativeLibraryDir.
This is a temporary workaround until we've switched all code
over to pm.createPackageContext().getApplicationInfo() or
whatever API we decide on to surface correct multi-arch
lib paths.
bug:
16013931
Change-Id: Ib719cf6f31da9a29b76e942cd2e28bda1f19b264
Deepanshu Gupta [Wed, 16 Jul 2014 17:45:33 +0000 (17:45 +0000)]
am
4b0cdfd0: am
6c57fc30: (-s ours) DO NOT MERGE - Fix LayoutLib.
* commit '
4b0cdfd0a46486d327603910d3f5de79fcbb0fc7':
DO NOT MERGE - Fix LayoutLib.
Deepanshu Gupta [Wed, 16 Jul 2014 17:35:24 +0000 (17:35 +0000)]
am
6c57fc30: (-s ours) DO NOT MERGE - Fix LayoutLib.
* commit '
6c57fc30198e8f3a2756aab6bc832450391eec94':
DO NOT MERGE - Fix LayoutLib.
Craig Mautner [Wed, 16 Jul 2014 17:26:16 +0000 (17:26 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp
Craig Mautner [Wed, 16 Jul 2014 17:25:48 +0000 (17:25 +0000)]
am
15c2da7c: am
2e7b2521: Merge "[ActivityManager]: Update home process when home activity resumed"
* commit '
15c2da7ce51ad1c1cbb07602644fa7291e8c7896':
[ActivityManager]: Update home process when home activity resumed
Jeff Sharkey [Wed, 16 Jul 2014 17:25:39 +0000 (17:25 +0000)]
am
14c39031: Merge "Clearing "cache" shouldn\'t include "code cache."" into lmp-dev
* commit '
14c39031ae495097457be8f194fcbc4bb66e386e':
Clearing "cache" shouldn't include "code cache."
Deepanshu Gupta [Wed, 16 Jul 2014 17:23:28 +0000 (10:23 -0700)]
DO NOT MERGE - Fix LayoutLib.
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122
Bug:
15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
Craig Mautner [Wed, 16 Jul 2014 17:21:21 +0000 (17:21 +0000)]
am
2e7b2521: Merge "[ActivityManager]: Update home process when home activity resumed"
* commit '
2e7b2521f1758bf16935a9a879c595cc44eab37f':
[ActivityManager]: Update home process when home activity resumed
Derek Tan [Wed, 16 Jul 2014 17:14:39 +0000 (17:14 +0000)]
am
d47c2729: Merge "Remove @hide annotations from important carrier privileged APIs." into lmp-dev
* commit '
d47c2729a62f974ae1981eaa03d7c7d336007afe':
Remove @hide annotations from important carrier privileged APIs.
Jason Monk [Wed, 16 Jul 2014 17:14:35 +0000 (17:14 +0000)]
am
bc0f6147: Merge "Finalizing lock-to-app UX" into lmp-dev
* commit '
bc0f6147ddc6718a30d12b89d9a39e65c568ef28':
Finalizing lock-to-app UX
Sandeep Siddhartha [Wed, 16 Jul 2014 17:05:04 +0000 (17:05 +0000)]
am
8a121f48: Merge "Hook in startRecogniton call" into lmp-dev
* commit '
8a121f484b64c7a4434dcad287d93532337e1d75':
Hook in startRecogniton call
Jeff Sharkey [Wed, 16 Jul 2014 17:00:30 +0000 (17:00 +0000)]
am
5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '
5ddccbd263e50c6c2d3b63ea290e0db661a726f5':
Add code cache directory for apps.
Dan Sandler [Wed, 16 Jul 2014 16:33:11 +0000 (16:33 +0000)]
am
dfd0d68d: Merge "Prevent dismissing autoredacted private notifications." into lmp-dev
* commit '
dfd0d68d406ae3b2fec322ca5fa6c82319a3a2fc':
Prevent dismissing autoredacted private notifications.
Dan Sandler [Wed, 16 Jul 2014 16:33:06 +0000 (16:33 +0000)]
am
af55ea83: Merge "Clean up autoredaction text." into lmp-dev
* commit '
af55ea83aca437b37714c90136556b7061abcb9c':
Clean up autoredaction text.
Alan Viverette [Wed, 16 Jul 2014 16:33:02 +0000 (16:33 +0000)]
am
c9ecc64b: DO NOT MERGE Add support for AVD reverse() to ASLD, clean up transition handling
* commit '
c9ecc64b0321680c48313a66ec0c5e71b9c50ffc':
DO NOT MERGE Add support for AVD reverse() to ASLD, clean up transition handling
Adrian Roos [Wed, 16 Jul 2014 16:32:58 +0000 (16:32 +0000)]
am
66bee705: Implement real QS user switcher
* commit '
66bee705e8237df03459e57b26b34af76df3c5ee':
Implement real QS user switcher
Alan Viverette [Sun, 13 Jul 2014 23:32:54 +0000 (16:32 -0700)]
DO NOT MERGE Add support for AVD reverse() to ASLD, clean up transition handling
BUG:
16162242
Change-Id: I29336491d01d40e5369503ece858bcbe5aa99b19
(cherry picked from commit
4e9c797a9c024e5a4226ed37eece16e3db2edb78)
Adrian Roos [Wed, 16 Jul 2014 14:44:49 +0000 (16:44 +0200)]
Implement real QS user switcher
Replaces the stop-gap user switcher with the real deal.
Dimensions may need some further adjustments.
Bug:
15545213
Change-Id: I4399635c03553dac935049d5b8297fe5f5c1dc9a
Craig Mautner [Wed, 16 Jul 2014 17:17:46 +0000 (17:17 +0000)]
Merge "[ActivityManager]: Update home process when home activity resumed"
louis_chang [Mon, 28 Apr 2014 08:59:22 +0000 (16:59 +0800)]
[ActivityManager]: Update home process when home activity resumed
Symptom:
When switch between two home activities, the home process might not be updated to the correct one. In that case, the home activity might be killed easily.
Root Cause:
The home process is updated only when a home activity is newly created or being restarted. ActivityManager did not update the home process when simply resume a home activity.
Solution:
Update home process when home activity resumed
Reproduce Steps:
1. Install a launcher application, such as Apex Launcher
2. Press home key to change to Apex Launcher by "Just once" option
3. Press home key to switch back to original home activity by "Just once" option.
(The home process is still the Apex Launcher's process because ActivityManager does not update the home process when resuming the original home activity.)
Change-Id: I046279ca7ba851a283ee67ea19202890f7b3f343
Christopher Tate [Wed, 16 Jul 2014 20:53:00 +0000 (20:53 +0000)]
Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
Christopher Tate [Wed, 16 Jul 2014 19:15:07 +0000 (12:15 -0700)]
Always call finishBackup() if performFullBackup() succeeded
Even if we later get an error from sendBackupData() we need to give
the transport its teardown callback. This simplifies the transport
logic considerably.
Change-Id: Ib8c0e210d4a876ee6b083a4d619dfccc462da4e5
Jeff Sharkey [Wed, 16 Jul 2014 20:49:40 +0000 (20:49 +0000)]
Merge "Install sessions only inherit APK files." into lmp-dev
Jeff Sharkey [Wed, 16 Jul 2014 18:32:08 +0000 (11:32 -0700)]
Install sessions only inherit APK files.
Also track historical install sessions for debugging purposes. Hide
signature verification API for now. Clear code cache only after
killing the app being upgraded.
Bug:
14975160
Change-Id: I52fc7f11d2506f792236d8a365c8cfed21b46c30
RoboErik [Wed, 16 Jul 2014 19:27:23 +0000 (19:27 +0000)]
Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
RoboErik [Wed, 16 Jul 2014 00:23:18 +0000 (17:23 -0700)]
Change adjustVolumeBy to adjustVolume
This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.
Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
RoboErik [Thu, 10 Jul 2014 20:48:01 +0000 (13:48 -0700)]
Make MediaSession and MediaController constructors public
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.
This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.
Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
Santos Cordon [Wed, 16 Jul 2014 23:35:05 +0000 (23:35 +0000)]
Merge "Add toString & equals helper methods to PhoneAccount.java"
Narayan Kamath [Wed, 16 Jul 2014 19:21:05 +0000 (19:21 +0000)]
am
b6c2cce1: am
baba92bd: Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev
* commit '
b6c2cce1233ce77565a7980752876ec73f10c537':
Dexopt for Context.createPackageContext when code is included.
Yorke Lee [Wed, 16 Jul 2014 19:12:49 +0000 (19:12 +0000)]
am
1c86f0da: am
af195ca0: Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev
* commit '
1c86f0da95f270c66e6356fc4d4bca1ef2c5fe08':
Make ContactPreferences use SharedPreferences instead of System settings (1/5)
Jean-Michel Trivi [Wed, 16 Jul 2014 19:03:44 +0000 (19:03 +0000)]
am
1a0cbfe3: am
a880e639: Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev
* commit '
1a0cbfe3dcc602e0fb2bc624dbd9c0eb545aa604':
MediaPlayer factory method with audio attributes and session ID
Quddus Chong [Wed, 16 Jul 2014 18:39:29 +0000 (18:39 +0000)]
am
1b0e8ea6: am
c93351fe: am
6743f1ea: am
1a2a9730: am
f0d8c6fc: Merge "docs: Fixed small typo. bug:
14617866" into klp-modular-docs
* commit '
1b0e8ea6866a97f7bfb3d02b847d5099b43688a8':
docs: Fixed small typo. bug:
14617866
Deepanshu Gupta [Wed, 16 Jul 2014 18:33:05 +0000 (18:33 +0000)]
am
28114aff: Merge "Use BlendComposite for advanced PorterDuff Modes." into lmp-preview-dev
* commit '
28114aff449c56ffa330f4ecbfae1f205e72cce2':
Use BlendComposite for advanced PorterDuff Modes.