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

125747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
5c79949324 Merge "Make LruCache.resize(int) public" 2014-02-21 12:36:20 +00:00
Craig Mautner
7dd976275d am e1abfdf7: am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 
* commit 'e1abfdf711ce9ff3b15ff1b4d86531f5a8dd3dec':
  Set the new SurfaceControl opaque flag.
 2014-02-20 20:59:18 -08:00
Craig Mautner
556ab60971 am 709efec6: am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 
* commit '709efec60deabf5a4260963e2b4c8e21f0428fc3':
  Resize DimLayer explicitly on rotation.
 2014-02-20 20:59:15 -08:00
Michael Wright
3bde644188 am d429710f: Merge "Unbreak manual brightness setting." 
* commit 'd429710f8edf6aeacb79c2f8ae8a6dc404173c42':
  Unbreak manual brightness setting.
 2014-02-20 20:59:11 -08:00
Jeff Brown
dda12a9746 am ac8bdfe4: Merge "resolved conflicts for merge of baaa080b to master" 
* commit 'ac8bdfe4f06367e06e43d8759b6009b483a5e668':
  Add a new "doze mode" based on Dream components.
 2014-02-20 20:59:08 -08:00
Ben Gruver
731f138b82 am 0e3b52e5: Merge "Add ability to match intents based on the package name of the intent sender" 
* commit '0e3b52e5e89ddebeba83ff9ee4360422293c2ee8':
  Add ability to match intents based on the package name of the intent sender
 2014-02-20 20:59:05 -08:00
Matt Casey
3bb3cd7f78 am 59270bff: Merge "Add more MediaStore constants for playback intents" 
* commit '59270bffe51de6c9c1ba9e88a6fd5215b717b25c':
  Add more MediaStore constants for playback intents
 2014-02-20 20:59:01 -08:00
Amith Yamasani
57f53f51ab am 1a405db2: Merge "Abort removing account if prohibited by policy" 
* commit '1a405db22a2ade6b745f3e1cf93ba0c54b048d95':
  Abort removing account if prohibited by policy
 2014-02-20 20:58:58 -08:00
Baligh Uddin
b68d800cb7 am 949131b6: (-s ours) am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '949131b6605f9dafc069eb918ff003a55f72d934':
  Import translations. DO NOT MERGE
 2014-02-20 20:58:52 -08:00
Baligh Uddin
b4744803d5 am d87e57f6: (-s ours) am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd87e57f6980847adeed04a6795e28b26ec4008e1':
  Import translations. DO NOT MERGE
 2014-02-20 20:58:48 -08:00
Baligh Uddin
bb2ab27b83 am 983f053f: (-s ours) am 46f1744a: (-s ours) am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '983f053f461e1eaec44013ab4eba700548329594':
  Import translations. DO NOT MERGE
 2014-02-20 20:58:45 -08:00
Baligh Uddin
ca6cff76ef am c038cd95: (-s ours) am e16fe1aa: (-s ours) am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c038cd95b9c5b76742cac4ff1cb36423b28f5d28':
  Import translations. DO NOT MERGE
 2014-02-20 20:58:42 -08:00
Baligh Uddin
2c476effd7 am 72781426: (-s ours) am e9a5424c: (-s ours) am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '72781426604697516c5c726e01750d919da66da8':
  Import translations. DO NOT MERGE
 2014-02-20 20:58:39 -08:00
Baligh Uddin
39e60e3c36 am f8ecdd0c: (-s ours) am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f8ecdd0c72418e971a2e76dbddee3e84242ee4fb':
  Import translations. DO NOT MERGE
 2014-02-20 20:58:36 -08:00
Xavier Ducrohet
12b96d5dcc am 92d5a67d: am 7d236199: (-s ours) am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '92d5a67d1bc3daf48386a026d60bf30415695049':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 20:58:33 -08:00
Deepanshu Gupta
c6fb45ffcd am 62b60626: am 7b5d0a82: (-s ours) am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '62b6062652073e366b2000d0fd55f8cb1a523fd9':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 20:58:30 -08:00
Justin Koh
4dc92625b6 am 0be0a503: am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5':
  Add hardware feature describing a watch.
 2014-02-20 20:58:27 -08:00
Alan Viverette
afb501582f am d85e7840: Merge "Fix density in touch feedback drawable" 
* commit 'd85e7840b03b64b2aa75361b739d0316ef1a9270':
  Fix density in touch feedback drawable
 2014-02-20 20:31:17 -08:00
Narayan Kamath
7ec24f6f68 am a50d7cf2: am 66e30b35: am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." 
* commit 'a50d7cf2d5b70cceef3b34d98df1d0d6be49dcb1':
  Fix several bad function definitions.
 2014-02-20 20:31:13 -08:00
Narayan Kamath
30bf0399e9 am 3fa48a20: am fb7b3181: (-s ours) am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit '3fa48a2063ab6af2fbf972d793edefefea0ca3be':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 20:31:08 -08:00
Narayan Kamath
2183c0d4b0 am f9bf991c: am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit 'f9bf991cb57e8835a2dcffb35853b4d77ac7b2c4':
  libandroidfw: fix build error for 64-bit
 2014-02-20 20:31:03 -08:00
Scott Main
18200ac5bb am 83b6e4b9: am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '83b6e4b937a2197198cefffecca94c919f9aa8cf':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 20:31:00 -08:00
Craig Mautner
c2c0a61cf5 Add copyright notice to files missing them. 
Fixes bug 13121968.

Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
 2014-02-20 20:25:41 -08:00
Craig Mautner
e1abfdf711 am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 
* commit '6222a8ef853609ea9c0f725c2412a2d25968d9da':
  Set the new SurfaceControl opaque flag.
 2014-02-21 04:20:58 +00:00
Craig Mautner
709efec60d am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 
* commit '56dbf7b092826b1cef42357bda422baf18d2292c':
  Resize DimLayer explicitly on rotation.
 2014-02-21 04:20:39 +00:00
Michael Wright
d429710f8e Merge "Unbreak manual brightness setting." 2014-02-21 02:09:49 +00:00
Jeff Brown
ac8bdfe4f0 Merge "resolved conflicts for merge of baaa080b to master" 2014-02-21 02:07:45 +00:00
Jeff Brown
10102e4c0e resolved conflicts for merge of baaa080b to master 
Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
 2014-02-20 18:05:03 -08:00
Michael Wright
5c977ea1b7 Unbreak manual brightness setting. 
Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
 2014-02-20 18:02:27 -08:00
Ben Gruver
0e3b52e5e8 Merge "Add ability to match intents based on the package name of the intent sender" 2014-02-21 01:18:59 +00:00
Matt Casey
59270bffe5 Merge "Add more MediaStore constants for playback intents" 2014-02-21 01:18:24 +00:00
Evan Charlton
64a44a876b Update CallServiceSelector API 
Move the consumer methods to the main thread and use response objects
to return the results back to the caller.

Change-Id: Ifc062cf49421079686d925406c823000232fa728
 2014-02-20 17:09:10 -08:00
Ben Gilad
6adbaf70f3 Addressing the TODO to rename CallServiceInfo. 
Also removing some unused imports etc.

Change-Id: I48176d5394aee0110f3b7a081a1a616b72b574b9
 2014-02-20 17:09:04 -08:00
Santos Cordon
3342e77ec9 Update current.txt to fix build. 
Change-Id: Ie0a8e5749e1aad3fbe0098294cfe192de419ad25
 2014-02-20 17:08:46 -08:00
Santos Cordon
591ef664d8 Fix build. 
Change-Id: I4633e4ab3753f0de328bbe0ef59e87dac1d58d54
 2014-02-20 17:08:25 -08:00
Santos Cordon
bd63f90a78 New call service methods for incoming calls. 
Adds a method that allows Telecomm to request confirmation of an
incoming call and another method on the adapter through which the
confirmation is sent.

Change-Id: Ib5d0a71f40ea3d09a42f31c479c22aed1dbc5ce8
 2014-02-20 17:07:54 -08:00
Evan Charlton
c3010b39c9 Add a CallServiceSelector base implementation 
Add the base class for implementing CallServiceSelectors.

Change-Id: I292d962f1b73d0966af0c484ebddc724f8e6c925
 2014-02-20 17:07:41 -08:00
Matt Casey
bd7bcf0fba Add more MediaStore constants for playback intents 
Constants are derived from this doc:
https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv

That doc contains the full explanation of these changes.

I'm making this change on behalf of {elmas,pengr} who don't have
android source access but designed this in collaboration with
rharagutchi on the play music team. I'll probably have to route any
significant questions through them.

Bug: 12874557
Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
 2014-02-20 17:06:09 -08:00
Alan Viverette
d7a1054b7a Invalidate projection receiver, refactor invalidate methods 
Change-Id: I61bd705abeadbdc6ef611d1c7368cecfd908076f
 2014-02-20 16:10:38 -08:00
Amith Yamasani
1a405db22a Merge "Abort removing account if prohibited by policy" 2014-02-21 00:06:03 +00:00
Derek Tan
0e44307211 Fix the inconsistent name on @param and the real param. 
Change-Id: If9853e91f55c0be89cdf77ae7c4369f274a45bb6
 2014-02-20 15:30:52 -08:00
Sailesh Nepal
120eb5b2a2 Update api 
Change-Id: I77a6f2c906b0df61cfdd64298c1cfe3f213a98d7
 2014-02-20 15:30:39 -08:00
Derek Tan
07823df111 Expose sendEnvelope. 
Change-Id: I21565fae9ba8f163aed9104db355aecf9bae1796
 2014-02-20 15:30:27 -08:00
Sailesh Nepal
f4c06145af Delete GLES20Layer DO NOT MERGE 
Looks like this was dropped by the automerger.

Change-Id: I59d85ee47c6b3478e6ded89b61a95d45df781068
 2014-02-20 15:28:14 -08:00
Evan Charlton
a69403224d Remove some duplicate methods 
Merge conflicts resulted in some duplicated methods.

Change-Id: Id7336f7441a7ded2088f01c3d76110c7860686cd
 2014-02-20 15:27:51 -08:00
Evan Charlton
7692be4129 Delete telephony's CallService 
This moved to telecomm; kill it again.

Change-Id: I6ae581ac3fe5417f3a17f10f8615caacc69a21ad
 2014-02-20 15:26:18 -08:00
Sailesh Nepal
968740b5f5 Add abstract base implementation of CallService. 
Base implementation takes care of a lot of boilerplate code.

Change-Id: Iaf5a16f5718727cee0f7efb4af53a021536f50d8
 2014-02-20 15:26:18 -08:00
Sailesh Nepal
77e0d606f6 Add interface definitions for CallService/PhoneService 
Interfaces are meant to replace ThirdParty*.aidl/java files in same
directory long term.  The differences in methods are on purpose and
reflect more recent design directions.

Change-Id: Ia98603a1d0b6d07a3393c5f7c5aa040f9e3916e4
 2014-02-20 15:26:03 -08:00
Amith Yamasani
5934dbc9f1 Abort removing account if prohibited by policy 
Bug: 13077993

If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.

Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
 2014-02-20 15:23:36 -08:00
Ben Gilad
35699a295a Following up on the TODO to rename newIncomingCall, see ag/417776 for the corresponding services/telecomm change. 
Change-Id: I8296856c2b8d89aa7962c9ccd231463b9b5e8079
 2014-02-20 15:23:08 -08:00