Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,335 Commits 3 Branches 0 Tags
b5f067ff580883c925d7f992005d8cd30cd97608
Commit Graph

9256 Commits

Author SHA1 Message Date
Adam Powell
1a37af077c am 64cacb6c: am b501fb2d: am 6caa43be: am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '64cacb6c70721065e8472075e1bb714b690f24cd':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 23:29:31 +00:00
Nancy Chen
927e0f55b0 am 46868b7c: am 4f3585f6: am 7d6ea755: am dec36fd9: am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev 
* commit '46868b7cee2e8e8ae79851ca419fbf862701a1a6':
  Add constructor for DisconnectCause that does not require a tone.
 2014-09-19 23:28:54 +00:00
Adam Powell
45acf7286f am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:43:48 +00:00
Adam Powell
17f48457d2 Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 2014-09-19 20:31:14 +00:00
Adam Powell
c6c744da75 Add colorEdgeEffect to themes, default it to colorPrimary 
Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
 2014-09-19 12:50:31 -07:00
Nancy Chen
a82dcedd30 am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev 
* commit '6f2712513c83a2f13bf6376182edabbf022da890':
  Add constructor for DisconnectCause that does not require a tone.
 2014-09-19 19:32:31 +00:00
Chris Craik
964c1d2fed am 5cb10c06: am 1fb91f51: am 158ab843: am 4f58dcf5: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev 
* commit '5cb10c0698ec39d44b9c6e24546e6db06a2fae4e':
  Hide other color filter mutability
 2014-09-19 18:40:10 +00:00
Nancy Chen
f4cf77c5dc Add constructor for DisconnectCause that does not require a tone. 
In order to create a DisconnectCause with a label/description that does
not require specifying a tone.

Bug: 17486242
Change-Id: If82605ff20fc9f53ed41b49e12575424c6efc2b6
 2014-09-19 11:01:45 -07:00
Chris Craik
c8fc7270b9 am e99510a4: Merge "Hide other color filter mutability" into lmp-dev 
* commit 'e99510a44685e4aff983eca9e432f8edbdfbd8fd':
  Hide other color filter mutability
 2014-09-19 17:54:42 +00:00
Chris Craik
f559326b18 Hide other color filter mutability 
bug:17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
 2014-09-19 08:54:09 -07:00
Shri Borde
a0d384482b am c7bc65ad: am 37e12347: am a848ad10: am 7e7619bd: Merge "Unhide SUB_ID column from Mms, Carriers and PendingMessages" into lmp-sprout-dev 
* commit 'c7bc65adbd2c0d9e5fb793cea9238e7daa41954b':
  Unhide SUB_ID column from Mms, Carriers and PendingMessages
 2014-09-19 08:14:26 +00:00
Shri Borde
b282a4abcc am 792e5cca: am 156dd558: am 3e766097: am 914b8ee7: Merge "Unhide android.provider.Telephony.Sms.SUB_ID" into lmp-sprout-dev 
* commit '792e5ccaecb2d8bf9518f543940fb4dddf2fde05':
  Unhide android.provider.Telephony.Sms.SUB_ID
 2014-09-19 07:13:53 +00:00
Wink Saville
7448fec633 am 570d5041: am b16447cb: Update current.txt for two renamed methods. 
* commit '570d50412e393259a57714df1e5c2f17bc947ad1':
  Update current.txt for two renamed methods.
 2014-09-19 04:25:33 +00:00
Wink Saville
5a1216bd67 am 7566ef9e: am 78a04d06: Unhide SubscriptionManager and SubInfoRecord 
* commit '7566ef9e16ed395ba50d27cafc0c51e0d1219411':
  Unhide SubscriptionManager and SubInfoRecord
 2014-09-19 04:08:27 +00:00
Ye Wen
4ca54a9a04 am 9bde517d: am 2fc00600: am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 
* commit '9bde517d501db412613f6ca62bb6cacc7954aba8':
  Add new error result code for mms config loading failure (1/2)
 2014-09-18 21:17:15 +00:00
Nancy Chen
6e560ee5b4 am 0b7b84ed: am 8e15e306: am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 
* commit '0b7b84ed9654bfce3c5f724f434ad1a945d5373e':
  Replace get*PhoneAccounts* public API methods with new method (1/3)
 2014-09-18 21:16:59 +00:00
Ye Wen
fc72b71b4b am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 
* commit '3b5939fc093043d4bfa4c1cfda80f4c5e9ab8548':
  Add new error result code for mms config loading failure (1/2)
 2014-09-18 20:00:28 +00:00
Ye Wen
9f5638ed23 Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 2014-09-18 19:53:25 +00:00
Nancy Chen
6810fb95a3 am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 
* commit '93c75e4567a727636d26e7e386a78a883e649e48':
  Replace get*PhoneAccounts* public API methods with new method (1/3)
 2014-09-18 18:54:37 +00:00
Ye Wen
d572e4504d Add new error result code for mms config loading failure (1/2) 
b/17556258

Change-Id: I589a7b77be215dc98fb9f2c9b1a04cac5ee53558
 2014-09-18 11:42:45 -07:00
Nancy Chen
513c892135 Replace get*PhoneAccounts* public API methods with new method (1/3) 
Hide getCallCapablePhoneAccounts and getPhoneAccountsSupportingScheme
because a third party app should not be able to see all phone accounts
registered. Replace instead with getPhoneAccountsForPackage(Context)
which will only return the phone accounts registered by a particular package.

Bug: 17510811
Change-Id: I8465ef4f13b62fe83f51835cfffe1656298041a8
 2014-09-17 18:34:13 -07:00
Jeff Hao
7d0b3d445a Deprecating InstructionCount. 
Bug: 17489901
Change-Id: I554b9f3ce20adce55d6967d79d37d86b171b91c4
 2014-09-17 17:27:03 -07:00
Shri Borde
c23d12c278 Unhide SUB_ID column from Mms, Carriers and PendingMessages 
Change-Id: Iaf651f96bdd52b71b268eb37ae66a285cbb8f140
 2014-09-17 15:14:35 -07:00
Yorke Lee
ee3b488df5 am 794b3057: am 7c6e6952: am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
* commit '794b305714228a215d7fc0e52f42bdc7619fdd37':
  Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
 2014-09-17 04:54:18 +00:00
Yorke Lee
1e80735526 am 8dc6bbed: am 5d454fcd: am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev 
* commit '8dc6bbedf226ccc699d43db1ff7c2d361a4bb5df':
  Add missing methods to Conference object
 2014-09-17 04:54:13 +00:00
Nancy Chen
f847938875 am cdfa60d0: am e5df9fa9: am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 
* commit 'cdfa60d059c541a418683e8e2b6ff35ca2594ed0':
  Remove ability to enable/disable phoneaccounts (1/6)
 2014-09-17 04:54:07 +00:00
Yorke Lee
9c412fb140 am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
* commit 'b23e025aab63b2318a5fb711433f51720e8c400b':
  Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
 2014-09-17 04:25:58 +00:00
Yorke Lee
58bacc513c Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
Bug: 17512380
Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
 2014-09-16 20:44:09 -07:00
Yorke Lee
edac2c611b am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev 
* commit '44b693a3cdee9908223723e961a29fbfc0305163':
  Add missing methods to Conference object
 2014-09-17 03:41:10 +00:00
Nancy Chen
68e3e27a1e am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 
* commit '05a2c7ef905777fdbc1129146df6f389e2e6980a':
  Remove ability to enable/disable phoneaccounts (1/6)
 2014-09-17 03:41:02 +00:00
Yorke Lee
1c4eb10cc1 Merge "Add missing methods to Conference object" into lmp-dev 2014-09-17 03:29:12 +00:00
Nancy Chen
ebc69cd19e Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 2014-09-17 03:23:04 +00:00
Andrew Lee
fb748b69d4 am 5325e9bf: am 2167e7dd: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '5325e9bf00c1a0b057cd66ede9f5ef10ee6c7f1e':
  Add new DisconnectCause class to telecomm.
 2014-09-16 22:18:08 +00:00
Andrew Lee
0686e30652 am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '258f835f705bfcead1769da703c4fdb78d71295a':
  Add new DisconnectCause class to telecomm.
 2014-09-16 21:51:43 +00:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm. 
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
 2014-09-16 12:07:41 -07:00
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
Jeff Sharkey
691ac9e7d0 am a6a5bea4: am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit 'a6a5bea41779c3f0764a2c0f18f1251649ddd1ee':
  Update API naming to follow style guide.
 2014-09-16 08:57:52 +00:00
Ihab Awad
02e2375c44 am 64741972: am fd9884ad: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '647419725bdddb764bfc6ae638ac0288bc8591e5':
  Add system feature for ConnectionService API support (1/3)
 2014-09-16 08:57:27 +00: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
Wink Saville
f2acfb481a am b16447cb: Update current.txt for two renamed methods. 
* commit 'b16447cb7d1463b2f7f182d2cbbd740ee855d95e':
  Update current.txt for two renamed methods.
 2014-09-16 00:05:28 +00: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
Wink Saville
1ecaf11828 am 78a04d06: Unhide SubscriptionManager and SubInfoRecord 
* commit '78a04d069fe0438cdb324cb94351ff79fa2f48cf':
  Unhide SubscriptionManager and SubInfoRecord
 2014-09-15 21:30:52 +00:00
Tom Taylor
98a94333c1 am 12410ca9: Merge "Revert "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId"" into lmp-sprout-dev 
* commit '12410ca93bdbbfdf028163eaf9f341a74152b8f2':
  Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId"
 2014-09-15 21:24:47 +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
5b9ff81225 am 309dc803: am 55311cba: am 7ca4682e: Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev 
* commit '309dc8039b9d1e8ad59d4cf77a9a6dd7123ced8f':
  GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""
 2014-09-14 10:38:57 +00:00