Commit Graph

143224 Commits

Author SHA1 Message Date
John Reck
52d2b2df9d am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
  Fix root RenderNode damage calculation
2014-07-17 18:14:18 +00:00
Stuart Scott
fd9c4a9cc3 am b8948923: Merge "MSIM: dump sub specific info" into lmp-dev
* commit 'b8948923b3f5eaf2eac96788294bc8c82cf0cfa9':
  MSIM: dump sub specific info
2014-07-17 18:14:13 +00:00
kmccormick
85bac44926 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.
2014-07-17 18:14:09 +00:00
David Friedman
92ba8e1e9f 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.
2014-07-17 18:14:05 +00:00
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Christopher Tate
e2ba7a37fc am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
* commit 'c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
  Always call finishBackup() if performFullBackup() succeeded
2014-07-17 16:45:23 +00:00
Jeff Sharkey
d520cbbb31 am 2158503f: Merge "Install sessions only inherit APK files." into lmp-dev
* commit '2158503ff835f60d1a39f5bac724dd90e0900403':
  Install sessions only inherit APK files.
2014-07-17 16:45:19 +00:00
Shishir Agrawal
169e888524 am 38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '38c365d037e40385f2b25cd0fe0214c24f2f08ed':
  Unhiding the SMS/MMS APIs for injection/transport.
2014-07-17 16:45:14 +00:00
Sharvil Nanavati
fb69b7b536 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.
2014-07-17 16:45:10 +00:00
Alan Viverette
a65fa6c960 am ca27046e: Merge "Fix state list drawable transitions" into lmp-dev
* commit 'ca27046ee1fd2e23512af943177d4eb35757865b':
  Fix state list drawable transitions
2014-07-17 16:45:05 +00:00
Fabrice Di Meglio
79b834078e 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
2014-07-17 16:45:01 +00:00
Jeff Davidson
46b6f2a8f4 am 8f406122: Remove obsolete remark from XXHDPI comment.
* commit '8f4061221469cde3d92b6f7dede5c8b10df1edc0':
  Remove obsolete remark from XXHDPI comment.
2014-07-17 16:44:56 +00:00
David Friedman
3daff9850e 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.
2014-07-17 16:44:47 +00:00
Deepanshu Gupta
5787b0dafa am f9c7a0ab: (-s ours) Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
* commit 'f9c7a0ab4ea11932b0710df5933b1db63f36ba81':
  Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
2014-07-17 16:44:42 +00:00
Deepanshu Gupta
f5fe7a5503 am 08f4aef0: (-s ours) Optimize Blend composites. [DO NOT MERGE]
* commit '08f4aef0f198d52b9c67def64626ff42593ad278':
  Optimize Blend composites. [DO NOT MERGE]
2014-07-17 16:44:38 +00:00
Deepanshu Gupta
9a75c1a649 am 21b0919f: (-s ours) Add BlendComposite.java [DO NOT MERGE]
* commit '21b0919fef8d160debe4651e414248b74cff6f29':
  Add BlendComposite.java [DO NOT MERGE]
2014-07-17 16:44:34 +00:00
Barnaby James
48f3552093 Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
2014-07-17 07:24:09 -07:00
Robert Ly
d1dcb3d115 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
2014-07-17 14:13:16 +00:00
Winson Chung
c85202449e 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)
2014-07-17 14:13:12 +00:00
RoboErik
1a50e1db0e am 22ea3c3d: am b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '22ea3c3ddaad1b25c05c3e6e6027747076d44750':
  Change adjustVolumeBy to adjustVolume
2014-07-17 14:13:02 +00:00
ztenghui
3f55ce84ff am 7fdb6e06: am 6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '7fdb6e0658855bb0a3ffe78c05bf509aa73aa1d7':
  Add more reverse support to AnimatedVD
2014-07-17 14:12:58 +00:00
RoboErik
e1ecd82cbb am 1cd008e1: am 9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '1cd008e1fe13b97068c3eac86b1b78ab20dca1fb':
  Make MediaSession and MediaController constructors public
2014-07-17 14:12:53 +00:00
Robert Ly
007ce2677f 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
2014-07-17 14:02:58 +00:00
Winson Chung
56e74d5218 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)
2014-07-17 14:02:55 +00:00
RoboErik
d35858662c am b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit 'b21fab77c0758da3dcb2fa0029fef92df4d5902a':
  Change adjustVolumeBy to adjustVolume
2014-07-17 14:02:50 +00:00
ztenghui
ab36c677ba am 6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '6f5df88108b7fb6b9a59ac36f448bd23b5397ef1':
  Add more reverse support to AnimatedVD
2014-07-17 14:02:46 +00:00
RoboErik
ce271b0615 am 9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '9b039cf80a0c0c388ccbd8b6ece9aa5c7b970f26':
  Make MediaSession and MediaController constructors public
2014-07-17 14:02:42 +00:00
Nicolas Prevot
1b9800c763 Merge "Remove cross-profile intent filters when removing a user." 2014-07-17 00:09:54 +00:00
Niels Egberts
6c472fe969 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
2014-07-17 12:19:42 +01:00
Nicolas Prevot
f6eb3e6eb9 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
2014-07-17 10:50:47 +01:00
Santos Cordon
197187300d Merge "Revert "Add toString & equals helper methods to PhoneAccount.java"" 2014-07-16 22:30:55 +00:00
Santos Cordon
a498ea04c0 Revert "Add toString & equals helper methods to PhoneAccount.java"
This reverts commit adcb1e1b8e8be5f39f5ea672f628cfcd4af19dff.

Change-Id: If8419d1a1fd90cfa2400f67e98e95258b3e38137
2014-07-16 23:36:28 +00:00
kmccormick
d40fa4276e am 1f4e5686: am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '1f4e56869c47a8ef68ef83b7693a0f93ad21c984':
  Doc Update: new Smack sample.
2014-07-16 21:44:50 +00:00
David Friedman
9fbd54a6a3 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.
2014-07-16 21:44:41 +00:00
kmccormick
1f4e56869c am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '289d3c253eafe09a2ba3614aeeb8ba80539175b7':
  Doc Update: new Smack sample.
2014-07-16 21:36:07 +00:00
David Friedman
8b51d07ffa 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.
2014-07-16 21:36:03 +00:00
kmccormick
289d3c253e am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit 'fc8a3b5f06fe725ed561fb3535efd02b16c526ea':
  Doc Update: new Smack sample.
2014-07-16 21:17:15 +00:00
David Friedman
a827c73832 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.
2014-07-16 21:17:12 +00:00
Sailesh Nepal
001bbbb239 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
2014-07-16 21:14:58 +00:00
Sharvil Nanavati
4990e4f0e3 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
2014-07-16 20:32:48 +00:00
Fabrice Di Meglio
278387fb5f Fix bug #16309454 Broken recent button after dismissing set time dialog
- correct set and use the Canceled state

Change-Id: Id60ae14c493254193ee677b66388a64a49618273
2014-07-16 20:13:45 +00:00
Jeff Davidson
61a5a3f2c3 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
2014-07-16 13:10:18 -07:00
David Friedman
046702ba57 A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
(cherry picked from commit fe545cdb4e)
2014-07-16 19:57:44 +00:00
David Friedman
12958a42ac 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.
2014-07-16 19:54:05 +00:00
Deepanshu Gupta
8ee6bcf809 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)
2014-07-16 19:53:38 +00:00
Deepanshu Gupta
47fa5c920d Optimize Blend composites. [DO NOT MERGE]
Removed redundant array allocations to improve performance for various
blending modes.

Change-Id: Iaba1d6ff3ad03eebdc859c599b610cc593370438
(cherry picked from commit 9ce0746104)
2014-07-16 19:52:48 +00:00
Deepanshu Gupta
3dfc1c21d5 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 882e087591)
2014-07-16 19:52:24 +00:00
David Friedman
c6474d97cc 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.
2014-07-16 19:50:24 +00:00
David Friedman
fe545cdb4e A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
2014-07-16 12:33:55 -07:00
Robert Ly
f49e33c87e am f3c3edfe: am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit 'f3c3edfee8d9a2148603c1082e128f8bcbe44fc0':
  docs: add EU legal notice
2014-07-16 19:32:11 +00:00