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

9042 Commits

Author SHA1 Message Date
Nancy Chen
210ef039fb Remove ability to enable/disable phoneaccounts (1/6) 
Enabling/disabling of phone accounts was only used for SIP accounts and
is no longer necessary for the purpose it was put in.
- Remove all references to enabling/disabling phone accounts
+ Rename getEnabledPhoneAccounts -> getCallCapablePhoneAccounts

Bug: 17510811

Change-Id: Id805daae3cc698c75f5e747b6a6107ab0bd3afa0
 2014-09-16 10:52:48 -07:00
Yorke Lee
a0d3ca9746 Add missing methods to Conference object 
Add setAudioState, onPlayDtmf and onStopDtmf to the conference object.
This fixes DTMF tones for conference calls.

Bug: 17512380
Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
 2014-09-15 19:18:13 -07:00
Shri Borde
7ac5d6fccd Merge "Unhide android.provider.Telephony.Sms.SUB_ID" into lmp-sprout-dev 2014-09-15 23:14:49 +00:00
Jeff Sharkey
2d360218b4 am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.
 2014-09-15 22:01:59 +00:00
Ihab Awad
e11a3b798b am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)
 2014-09-15 22:01:41 +00:00
Jeff Sharkey
49c0e7375b Merge "Update API naming to follow style guide." into lmp-dev 2014-09-15 21:51:18 +00:00
Jeff Sharkey
de74231f24 Update API naming to follow style guide. 
Bug: 17510755
Change-Id: If73d81b416355559592feb895a62132194f4ba62
 2014-09-15 14:17:46 -07:00
Shri Borde
aa7c8c7bf6 Unhide android.provider.Telephony.Sms.SUB_ID 
Change-Id: Ic25f1248ac8c970ce57fc2b26740188b6d6ccf01
 2014-09-15 13:48:49 -07:00
Ihab Awad
1ec6888685 Add system feature for ConnectionService API support (1/3) 
Bug: 17445268
Change-Id: Ibf52cb394f00d075afd07b883a91f00da84b3c85
 2014-09-15 09:10:54 -07:00
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
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
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
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
Cheuksan Wang
f7a1e7a69e am 59c04032: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 
* commit '59c0403265a842ae47559b8b2055372a545edb61':
  Send and download MMS via content provider instead of PDU bytes.
 2014-09-12 18:52:39 +00:00
Sander Alewijnse
680a5b99cd am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit '4d9fe6d15a4aa661eaea5b34a1810b4986732c4f':
  Rename email extra.
 2014-09-12 18:52:31 +00:00
Kenny Guy
08786c2b61 am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit 'b5153aba264932068895228d3dde4e32a4ef271c':
  Hide APIs renamed during API review of LauncherApps
 2014-09-12 18:52:02 +00:00
Jessica Hummel
ba64bda79d am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit 'a387dc16b436d9d76b247c8f623157acb6df88ad':
  Use correct string for provisioning complete action.
 2014-09-12 18:51:48 +00:00
Marcin Kosiba
288e7de22e Remove an @removed member of andorid.webkit.WebResourceResponse. 
BUG: 17253647
Change-Id: I02f4f0600a09ceb3b68ba2698b80e413e7511663
 2014-09-12 18:24:49 +01:00
Cheuksan Wang
a6c52ac624 Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 2014-09-12 17:07:49 +00:00
Sander Alewijnse
098116854e Merge "Rename email extra." into lmp-dev 2014-09-12 16:14:30 +00:00
Kenny Guy
b6edee0dad Hide APIs renamed during API review of LauncherApps 
Bug: 17390765
Change-Id: I79a979365005b13a2268b1cfe455241ae4fecb51
 2014-09-12 11:44:58 +00:00
Sander Alewijnse
2b338a27be Rename email extra. 
Bug:17389863
Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
 2014-09-12 12:28:40 +01:00
Jessica Hummel
d4aaab99bb Merge "Use correct string for provisioning complete action." into lmp-dev 2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d Use correct string for provisioning complete action. 
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
 2014-09-12 09:27:30 +00:00
Yohei Yukawa
e26d921175 am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev 
* commit 'b7dd9519c9e3566a7c857c5caf92a8a2a1a48401':
  API Review: Clean up removed APIs
 2014-09-12 07:29:06 +00:00
Alan Viverette
7b49bbc59d am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit 'd843db67af2c88a55f14a4d54036843c1934323d':
  Remove unsafe methods that take TypedArray
 2014-09-12 07:23:07 +00:00
Tyler Gunn
d32d9d2585 am a7c57800: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (1/3)" into lmp-dev 
* commit 'a7c57800538e201f25dd4bc75ced1e58837e5513':
  Add intent broadcast when a PhoneAccount is enabled or disabled. (1/3)
 2014-09-12 07:22:58 +00:00
Alan Viverette
9241c9fdb8 am 534c3d39: Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev 
* commit '534c3d3900406e30cd3ee15703ee9c2f9d362b0b':
  Make the TimePicker and light DatePicker styles public
 2014-09-12 07:22:54 +00:00
Michael Wright
4fceb254d2 am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit '44c97df34f49908e1c9dce31813d2f3e39c20dc3':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 07:22:27 +00:00
Ihab Awad
0b129de192 am 0bf3d66d: Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev 
* commit '0bf3d66deb849bf8eaba2ef613beaba0b96479b9':
  Change UI to represent conferenced IMS connections (1/3)
 2014-09-12 07:22:01 +00:00
Adam Powell
17b17e2be1 am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit '51eee88c3355973ef648cef822f4a737c5b0a6b9':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 07:21:57 +00:00
Prerepa Viswanadham
4d097ce830 am 041299e3: Remove onConnectionCongested callback 
* commit '041299e377de125746800f5d4644d9fd4b793cf8':
  Remove onConnectionCongested callback
 2014-09-12 07:21:42 +00:00
George Mount
9a5e40fbe5 am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '3081e3601760871fea78d878e752b556974cb55b':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 07:21:28 +00:00
Sreeram Ramachandran
bed5da12da am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '8ab9b4c765b7a05223e4013f6e1d8b810a0b272c':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 07:21:16 +00:00
Andrew Lee
9bd4dfa5db am a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev 
* commit 'a523c405c9aeefcb7512d049adf76dcc6b247d42':
  API cleanup for RemoteConnection.
 2014-09-12 07:21:12 +00:00