drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
142,772 Commits 1 Branch 0 Tags
Commit Graph

142772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
16c14533cd Import translations. DO NOT MERGE 
Change-Id: I18d8bb62a43325d925743f8ef6e5ce7562485cf2
Auto-generated-cl: translation import
 2014-07-16 17:39:00 -07:00
Jeff Davidson
58fba8b14b Merge "Expose network scoring APIs to /system apps." into lmp-dev 2014-07-16 23:37:00 +00:00
Jeff Davidson
7be8e9725f Expose network scoring APIs to /system apps. 
Ideally, we'd only expose the methods that we intend unbundled apps to
call (e.g. not NetworkScoreManager#setActiveScorer, which should only
be called by Settings), but this isn't harmful in terms of permissions
as the APIs still check security appropriately.

Bug: 15833200
Change-Id: I2047515b41c8be0cf7cb51dd495fe72309c05f68
 2014-07-16 17:24:46 -07:00
Baligh Uddin
12eb1ff790 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 22:04:55 +00:00
Baligh Uddin
caa601385e Import translations. DO NOT MERGE 
Change-Id: I8c040d7092dcdc68fe1e640a759123b306eff507
Auto-generated-cl: translation import
 2014-07-16 18:07:09 -07:00
Baligh Uddin
28618a384c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:42:05 +00:00
Baligh Uddin
fa8d78019c Import translations. DO NOT MERGE 
Change-Id: I499617c1385457c1f844f73b042ef5c360ad14cc
Auto-generated-cl: translation import
 2014-07-16 18:13:44 -07:00
Chulwoo Lee
d0d02e22ce Introduce "input_id" column to the channels table 
Until now, TvInputService has been providing the channels. But from now
on, a TvInputService can have several TV inputs and the TV input will
provide its channels.
So introduced "input_id" which is the ID of the TV input instead of
"service_name" which designates the TvInputService.
Also updated related APIs.

BUG: 16138420
Change-Id: I1d4dcad17c028384ab75a7f71ee0b305509ae952
 2014-07-16 12:19:03 +00:00
Chulwoo Lee
029179d7f9 Pass input ID to the setup/settings activity 
In the setup/setting phase, the activities should know their input ID
to access the channels/programs table.

Change-Id: If7afcb0ea474dca08c3dee06cbfcf76191a68660
 2014-07-16 20:26:12 +09:00
Shishir Agrawal
8b4649c2e6 Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev 2014-07-16 02:25:05 +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
Shishir Agrawal
ed9c3a4a1f Unhiding the SMS/MMS APIs for injection/transport. 
Change-Id: I9e634c8f1c42738465825e767bc7ef3c4778eb30
 2014-07-16 13:21:43 -07: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
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 9ce074610413ce3a5dd0cef9295f0ae9061402b7)
 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 882e08759137a77090c3c7dff8cba425a3393474)
 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
Robert Ly
f3c3edfee8 am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit 'bafdb90070bf3f5120599efd322fdd20a31e84ef':
  docs: add EU legal notice
 2014-07-16 19:28:57 +00:00
Robert Ly
bafdb90070 am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit '82088d62f81a1d842bdb2d285ed578c562b20edd':
  docs: add EU legal notice
 2014-07-16 19:23:46 +00:00
Quddus Chong
6743f1ea92 am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit '1a2a9730e605e5a3ea46db1049bf950a669cb0d3':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:17:18 +00:00
Quddus Chong
1a2a9730e6 am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:13:19 +00:00
Chris Smith
23a0b3d9d5 am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '211c58448e21ad210a497658fdf1dd26b0c96faf':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:13:14 +00:00
Chris Smith
211c58448e am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:09:17 +00:00
Deepanshu Gupta
6c57fc3019 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
 2014-07-16 10:23:28 -07:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
f0d8c6fcae Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
Chris Smith
7a04794186 docs: Fix minor issues with Wear data events docs. 
Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987
 2014-07-16 14:49:36 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Robert Ly
e104012f1b am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit '8231174ec5b4d720cde2d1d7abb40ee9bde32c7d':
  NDK filesizes and hashes updated
 2014-07-16 13:29:04 +00:00
Ricardo Cervera
9e4db5b76a am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:29:00 +00:00
Robert Ly
4460bff8b3 am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '1374f6ea86f982e7600b9b2714747bc654243591':
  docs: add edu video highlights
 2014-07-16 13:28:56 +00:00
Andrew Solovay
52f0b5740e am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:28:53 +00:00
Quddus Chong
13fc31df3c am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit 'b2b1c5fa89a497f8e75cde7011795eae625a1722':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:28:49 +00:00
Ricardo Cervera
3b0909c49b am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit '0acf9d2f9a1c74308db4632530f5b57e6cde5f9d':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:28:44 +00:00
David Friedman
ede1910aa4 am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:28:37 +00:00
Andrew Solovay
5755377592 am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:22:57 +00:00
Robert Ly
8231174ec5 am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit 'bf42978e14e352984eb5443687fccd5b15dc27a3':
  NDK filesizes and hashes updated
 2014-07-16 13:22:54 +00:00
Ricardo Cervera
b5cd197646 am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'c79f3d696a24ade6017b0e91d92898190c204dd2':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:22:50 +00:00
Robert Ly
1374f6ea86 am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '649e8f9b2b9442fc29570f86a2f92fe5b7538c45':
  docs: add edu video highlights
 2014-07-16 13:22:47 +00:00
Andrew Solovay
0791c612b9 am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:22:44 +00:00
Quddus Chong
b2b1c5fa89 am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit '6a5dd93652ffce88891c2bd2dc7a19c764075631':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:22:44 +00:00
Ricardo Cervera
0acf9d2f9a am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit 'de138276f1c0a02f91e32f889639c629d883f948':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:22:43 +00:00
David Friedman
ddf853e0ce am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit '7f6af88e9460b788f68e956c9b104bc68fcfc8c4':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:22:43 +00:00
Alan Viverette
e4272bb323 Merge "Fix state list drawable transitions" into lmp-dev 2014-07-16 02:25:05 +00:00