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

9306 Commits

Author SHA1 Message Date
Qiwen Zhao
cc8351cca9 am 7ca4682e: Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev 
* commit '7ca4682e2d4b256b62edca558a6f3a2494d0dcd4':
  GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""
 2014-09-14 08:56:34 +00:00
Qiwen Zhao
a11757c187 Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev 2014-09-14 02:53:32 +00:00
Qiwen Zhao
63c7444bab GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers."" 
This reverts commit c4bc83b7b5f7911bf750544aa8a2211ae6d11fe2.

Change-Id: I484953c5c3b130b3359ef47aca890fa6903917a6
 2014-09-14 02:53:04 +00:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00:00
Tyler Gunn
cc616bca0d am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
  Renaming Telecomm to Telecom.
 2014-09-13 18:19:31 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Adam Powell
2f786a08ea am e905eb11: am 8e8d8655: am dd9488c1: Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 
* commit 'e905eb1112029d894bf7517db14c88fb66e7ebfd':
  Provide a public API for View#computeFitSystemWindows
 2014-09-13 03:07:13 +00:00
Amith Yamasani
952e4d59c3 am d75a27cb: am 67e56d47: am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 
* commit 'd75a27cb17bd42efd7edd697fe8acd51e2592eee':
  Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
 2014-09-13 03:06:50 +00:00
George Mount
1340b81a9d am a5a9061f: am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit 'a5a9061f7e3679387285671ff94caa5dde65f2b0':
  Changed method name to match Activity's method name.
 2014-09-13 02:26:43 +00:00
Dianne Hackborn
37c2472504 am 32326ae8: am d37c9323: am 019a55d1: Merge "Revert "Set up final resource identifiers."" into lmp-dev 
* commit '32326ae8412284534e531c0e63c11e607b24b6d5':
  Revert "Set up final resource identifiers."
 2014-09-13 02:26:37 +00:00
Dianne Hackborn
49243acf87 am 896be738: am 8ceb5021: am 1379b508: Merge "Set up final resource identifiers." into lmp-dev 
* commit '896be7389a490da7a9eed138a31c7d3e93415ff5':
  Set up final resource identifiers.
 2014-09-13 02:26:31 +00:00
Marcin Kosiba
4debd8ed58 am 85fece5c: am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '85fece5c6d284afb58a7550a55d24606a20b4905':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-13 02:16:17 +00:00
Cheuksan Wang
9deec68832 am 051af39c: am 249ef14b: am 59c04032: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 
* commit '051af39c8357fcb7d40c99781bde92f34c4ffe50':
  Send and download MMS via content provider instead of PDU bytes.
 2014-09-13 02:16:10 +00:00
Sander Alewijnse
923f567c85 am ae675cb2: am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'ae675cb2a18ec63ae69bd1b69ea7b5a2f486cce0':
  Rename email extra.
 2014-09-13 02:15:59 +00:00
Kenny Guy
456a14ac4e am 09e1ce52: am 46247469: am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit '09e1ce5249141b0b97e34e16f9f43b15f8b552f5':
  Hide APIs renamed during API review of LauncherApps
 2014-09-13 02:15:14 +00:00
Jessica Hummel
ea7c1dc4a9 am 1a1b9446: am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '1a1b94468b14a4627614cb7fb9a057076c2369bd':
  Use correct string for provisioning complete action.
 2014-09-13 02:14:54 +00:00
Adam Powell
c30ea3d69e am dd9488c1: Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 
* commit 'dd9488c13f16699d190e399324c18b557b6a5b38':
  Provide a public API for View#computeFitSystemWindows
 2014-09-13 00:35:40 +00:00
Adam Powell
2642357b82 Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 2014-09-13 00:22:29 +00:00
Amith Yamasani
57801c13d4 am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 
* commit '13c4e5ad86bcf61e12d5f928ba36bc0db2dd75bf':
  Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
 2014-09-13 00:08:23 +00:00
Adam Powell
d72068b38e Provide a public API for View#computeFitSystemWindows 
The current hidden API is necessary to perform correct inset behavior
for support libraries like appcompat. Provide a public method
consistent with the new WindowInsets APIs.

Bug 17411097

Change-Id: I71a63eea0238b94cae6b5c6f1721d5567560ba81
 2014-09-12 16:51:28 -07:00
Amith Yamasani
1d653272a2 Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS 
Bug: 17392243
Change-Id: I5ff0e70eeeeba264c96eaa2a17a6bd3669576c96
 2014-09-12 16:45:33 -07:00
George Mount
a34e4c5e1f am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit 'f607a73b9cfe059739b245d8aff70ed2747334c6':
  Changed method name to match Activity's method name.
 2014-09-12 21:43:42 +00:00
George Mount
85ea498d86 Changed method name to match Activity's method name. 
Bug 17488968

Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
 2014-09-12 14:19:40 -07:00
Dianne Hackborn
4f5779de33 am 019a55d1: Merge "Revert "Set up final resource identifiers."" into lmp-dev 
* commit '019a55d1976b1611c9a6a57b094ca0b1da8bb469':
  Revert "Set up final resource identifiers."
 2014-09-12 21:16:56 +00:00
Dianne Hackborn
54c199e507 am 1379b508: Merge "Set up final resource identifiers." into lmp-dev 
* commit '1379b5081522e03be4f2d9063321040945bed03a':
  Set up final resource identifiers.
 2014-09-12 21:16:52 +00:00
Dianne Hackborn
86ae74b129 Merge "Revert "Set up final resource identifiers."" into lmp-dev 2014-09-12 21:03:59 +00:00
Dianne Hackborn
5128efa648 Revert "Set up final resource identifiers." 
This reverts commit 5dea4bd5cd24f188bec7a91e25f644fc198c52d4.

Change-Id: Ib143e2a3fd58f20b03a408beed4b7dbdf69cbe79
 2014-09-12 21:01:36 +00:00
Dianne Hackborn
46d02d5596 Merge "Set up final resource identifiers." into lmp-dev 2014-09-12 21:01:02 +00:00
Dianne Hackborn
2a74d8cb84 Set up final resource identifiers. 
Change-Id: I43c46ffa9a2453afbade54ba8b0e7c0b506f794b
 2014-09-12 13:38:28 -07:00
Yohei Yukawa
db2d31a2d2 am 869642df: am 5bdb322f: am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev 
* commit '869642df55345676fbdd263708bd1380d3eba483':
  API Review: Clean up removed APIs
 2014-09-12 19:28:25 +00:00
Alan Viverette
21360c7339 am 5c2c69bb: am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit '5c2c69bb552f2d7eaa357969ab0da8877441cc5a':
  Remove unsafe methods that take TypedArray
 2014-09-12 19:25:52 +00:00
Tyler Gunn
8e7d04ee14 am 1a63c48d: am d79fbfad: am a7c57800: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (1/3)" into lmp-dev 
* commit '1a63c48d55b79d163cac45d967f0db42b6665fd5':
  Add intent broadcast when a PhoneAccount is enabled or disabled. (1/3)
 2014-09-12 19:25:41 +00:00
Alan Viverette
10d3865f62 am 710e47b1: am 3a8bbe22: am 534c3d39: Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev 
* commit '710e47b11c32c3b8ac08de9af639d42c7d730b3b':
  Make the TimePicker and light DatePicker styles public
 2014-09-12 19:25:35 +00:00
Michael Wright
93f120b6ee am f015309d: am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit 'f015309d6df6647732d35e01133d278cd2b59e69':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 19:24:52 +00:00
Ihab Awad
560d161314 am 7f29c5ef: am 7746d2c5: am 0bf3d66d: Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev 
* commit '7f29c5ef8123c46343e5d700520e9cd0579b281b':
  Change UI to represent conferenced IMS connections (1/3)
 2014-09-12 19:24:16 +00:00
Adam Powell
6e9f8a7be1 am 9854feaf: am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit '9854feaf50aeae95adfa1a70e037a95d4cd3b85d':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 19:24:10 +00:00
Prerepa Viswanadham
8e91c94ca0 am a4a6bca6: am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit 'a4a6bca675df63115b52e7a16aebbdd6beb59657':
  Remove onConnectionCongested callback
 2014-09-12 19:23:47 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
Sreeram Ramachandran
dd6ecbaaee am 2b3b6875: am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '2b3b68753f4bb2231d9a17393fdfeac93a1b24c0':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 19:23:08 +00:00
Andrew Lee
cc004e1aaf am 5e1e02bb: am ed7850b0: am a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev 
* commit '5e1e02bbfa7a0be98a986fe2114f236502c27a24':
  API cleanup for RemoteConnection.
 2014-09-12 19:23:02 +00:00
Nancy Chen
ad1cd9cbae am b89f4079: am a7766a4b: am 03ee9f82: Merge "Update TelecommManager per API requirements. (1/3)" into lmp-dev 
* commit 'b89f40791bf48e2b9e89ffe04830d42ca05e8e19':
  Update TelecommManager per API requirements. (1/3)
 2014-09-12 19:22:29 +00:00
Michael Wright
dfb309b870 am b04d7260: am 4b5e1fbe: am 54bc6182: Change callback methods from add to register. 
* commit 'b04d72602b06aa33034b17c9f29b8abba34644c5':
  Change callback methods from add to register.
 2014-09-12 19:22:19 +00:00
Robin Lee
d3cf89a532 am 651dc502: am 3da67a7a: am 7ac7a7d8: Update API 
* commit '651dc5026d0abeff0a04c1563c72152c2ef2a727':
  Update API
 2014-09-12 19:21:59 +00:00
Nancy Chen
f59044b560 am 4caddb10: am 4d4b7ee6: am 63a12357: Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev 
* commit '4caddb10f5e9392ef0f60f3274d0e9d1236b7c19':
  Make changes to Connection in Telecomm API (1/4)
 2014-09-12 19:20:40 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-12 19:19:24 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
 2014-09-12 19:18:50 +00:00
Tyler Gunn
ec83bc514a am 170694a5: am a99279fe: am ba740d4f: Allowing enable/disable of phone accounts. (1/3) 
* commit '170694a5d8803e26b35bbeba63b0add9e6f2191a':
  Allowing enable/disable of phone accounts. (1/3)
 2014-09-12 19:18:45 +00:00
Nancy Chen
bf7bf467d9 am d048afca: am f05b8506: am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 
* commit 'd048afca82398e694d1089fea7861d03843be815':
  API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
 2014-09-12 19:18:39 +00:00
ztenghui
0421e5f947 am 85c9f80a: am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '85c9f80a2ce712891fec9411562bd0cb48249586':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-12 19:18:25 +00:00
Marcin Kosiba
e8add4dc6a am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '46683a272ea5283a43d89a84bdab048994ca6a14':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 18:52:44 +00:00