Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,877 Commits 3 Branches 0 Tags
30618384f69223bee3796cee71bd9d2b533bb721
Commit Graph

8880 Commits

Author SHA1 Message Date
Winson Chung
30618384f6 am 3407514f: am 69c8df27: am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '3407514fb9a96f9a32451f1bbc9892e070375262':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:54:58 +00:00
Craig Mautner
f25a0c2ced am 7dfb0390: am b8479376: am d5bb6256: Merge "Update API per council request" into lmp-dev 
* commit '7dfb0390a83b79cbdc334e19f03b1da790871943':
  Update API per council request
 2014-09-05 15:33:16 +00:00
Winson Chung
acdc602f18 Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 2014-09-05 13:41:40 +00:00
Craig Mautner
f634c08b57 Merge "Update API per council request" into lmp-dev 2014-09-05 01:33:31 +00:00
Yorke Lee
085146635a am 515f49b3: am 159a547b: am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '515f49b3f34ac3ebe768ab005e9d439886bde921':
  ContactsContract API changes per API review
 2014-09-05 00:51:48 +00:00
Ye Wen
92ff3f6714 am d2bbfc6f: am c4c556e5: am 3442921f: Merge "MMS API cleanup (1/4)" into lmp-dev 
* commit 'd2bbfc6ffae294e9d9d316c1bd61b7f7139e16c6':
  MMS API cleanup (1/4)
 2014-09-05 00:08:24 +00:00
Yorke Lee
78814623e0 ContactsContract API changes per API review 
Bug: 17390425
Change-Id: Ia88fb0235a56becc3ec5a770067856311769a68c
 2014-09-04 16:51:53 -07:00
Dianne Hackborn
0db575d3cc am 430f7a2a: am 8dd4914b: am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit '430f7a2a20580f3f7ecfddb3dd3b28e22849852f':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:42:05 +00:00
Ye Wen
70afe9ee84 Merge "MMS API cleanup (1/4)" into lmp-dev 2014-09-04 23:36:00 +00:00
Tom O'Neill
7251ee390f am efb3b23f: am 15674b91: am b1a1f355: Merge "Keep LMP from breaking KitKat API" into lmp-dev 
* commit 'efb3b23f7ef672ae24dd655950e0fedfe22c5066':
  Keep LMP from breaking KitKat API
 2014-09-04 23:22:00 +00:00
Dianne Hackborn
edfc6af590 Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 2014-09-04 23:08:24 +00:00
Tom O'Neill
649db7f0a5 Merge "Keep LMP from breaking KitKat API" into lmp-dev 2014-09-04 22:56:58 +00:00
Tom O'Neill
17c5e79496 Keep LMP from breaking KitKat API 
- Bug: 17390371

Change-Id: I25c1abebcc42ed24abd57bbe2834a40fb8ee834b
 2014-09-04 15:42:36 -07:00
Ye Wen
8179c2a6e4 MMS API cleanup (1/4) 
- Hide APIs not approved by API council (b/17189780)
- Change configOverrides in MMS APIs from ContentValues to Bundle to be
consistent (b/17390017)
- Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council
review (b/17390977)

b/17189780
b/17390017
b/17390977

Change-Id: If5a43e9ab9e42b6328f1581b39051ddf1a58f0dd
 2014-09-04 15:41:56 -07:00
Craig Mautner
7a629c2d04 Update API per council request 
A few protected => public changes and picking up another change
in ViewAnimationUtils that got missed.

Fixes bug 17389511.

Change-Id: I75027535eade6427c2d9067369426297c168e77e
 2014-09-04 14:57:04 -07:00
Dianne Hackborn
521e4bd7c5 Fix issue #17375172... sshhhhhh!!! 
Change-Id: Idf3eafe829418bfc29e31f893ae6cff249488ffa
 2014-09-04 14:50:26 -07:00
Alan Viverette
ae8aa23a36 am c6ad9587: am 2bb0dec5: am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit 'c6ad9587abbc469122d653127a11a05209bd9f2c':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:28:44 +00:00
Adam Lesinski
9af8dc1e2a am f0e1995c: am 9d54107e: am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit 'f0e1995c81ffc925ae630987df26641330df4a38':
  Add Configuration changes to UsageStats
 2014-09-04 21:18:22 +00:00
Alan Viverette
3b256c850c Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 2014-09-04 20:45:12 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jason Monk
5a7f1877e9 am 849a9445: am f8c1c23f: am f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev 
* commit '849a9445e6214ab5d74cfa2ae1f1515b8b9c8199':
  Proxy fixes from API review feedback
 2014-09-04 20:24:26 +00:00
Ye Wen
2357f94598 am 470b6205: am 9a73a14e: am f9723425: Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 
* commit '470b6205e9c61060015d1047aaef68a1a995da80':
  Add missing mms_config key enableGroupMms to SmsManager (1/2)
 2014-09-04 20:12:01 +00:00
Jason Monk
7a0e79850f am de6e56d8: am 2b9a1d51: am 2d084e75: Merge "Change constants from API review feedback" into lmp-dev 
* commit 'de6e56d8fda86cc0e7712e49dab370d21a3addb3':
  Change constants from API review feedback
 2014-09-04 20:11:54 +00:00
Jason Monk
9f30ce3b82 Merge "Proxy fixes from API review feedback" into lmp-dev 2014-09-04 19:52:03 +00:00
Ye Wen
f40275d35e Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 2014-09-04 19:45:01 +00:00
Jason Monk
8236413ce0 Proxy fixes from API review feedback 
Bug: 17389383
Change-Id: Ib5e40f55d02687ee917ba30773123cf3e4c2a97d
 2014-09-04 15:39:56 -04:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats 
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
 2014-09-04 12:15:32 -07:00
Ye Wen
fe4bf48b92 Add missing mms_config key enableGroupMms to SmsManager (1/2) 
b/17390011

Change-Id: I6bef36521de6cd1644f83a667753542313fa8d8b
 2014-09-04 11:32:14 -07:00
Jason Monk
5503a55c0b Change constants from API review feedback 
Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
 2014-09-04 14:25:45 -04:00
RoboErik
8f7ac26a2f am 82f0f332: am dd22920f: am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev 
* commit '82f0f332944acfe13d52a3099825d77edd4c9d4a':
  Update VolumeProvider apis per feedback
 2014-09-04 18:10:00 +00:00
RoboErik
f85a08d30f Merge "Update VolumeProvider apis per feedback" into lmp-dev 2014-09-04 17:38:01 +00:00
Winson Chung
ee0b12161a Generalizing Recents widget category to Search box. (Bug 17334589) 
Change-Id: Id62398255799844cc89affcb4bafc86b6479dad0
 2014-09-04 17:13:17 +02:00
Sander Alewijnse
b44b5d2fa9 am 32cbce43: am 085baf07: am 7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev 
* commit '32cbce437fbd3f9ed94275b630a98bda970b7b08':
  Rename email extra to email bundle key.
 2014-09-04 12:26:03 +00:00
Sander Alewijnse
aff9f4cb88 Rename email extra to email bundle key. 
Bug:17197410
Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
 2014-09-04 12:28:52 +01:00
Alan Viverette
ba9bf41a77 Fix AM/PM text i18n and clean up keyboard support in time picker 
Also updates date picker to use drawable for the header background to
match the implementation in time picker. The time picker background
now supports showing a focused state ripple.

BUG: 17344077
BUG: 16227517
Change-Id: Ida715badb4a151fc16edd91fd4a0dae32953c99e
 2014-09-03 20:14:21 -07:00
Selim Gurun
6d3dffd5eb am f9c523fa: am 972bff24: am 5a1bcaba: Merge "Remove unpublished optOutDataReductionProxyApi" into lmp-dev 
* commit 'f9c523faa11e57278efa70d1a04e5c43c82bc324':
  Remove unpublished optOutDataReductionProxyApi
 2014-09-04 00:01:37 +00:00
Nancy Chen
ead91e38f7 am 0eee0f7c: am 0e00b43f: am d93b5e24: Merge "Update api for onConnectionAdded/Removed" into lmp-dev 
* commit '0eee0f7cac50f83f37aa236b1b646684d5a2f902':
  Update api for onConnectionAdded/Removed
 2014-09-04 00:00:45 +00:00
Julian Odell
f2410b6416 am 78ef64e5: am 2627e56c: am 45ae7fb1: Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 
* commit '78ef64e54e3ed37c53b7e0a6d306872029b9dbbb':
  Bug 17262099: MMS API changes (multi-project).
 2014-09-04 00:00:25 +00:00
Evan Charlton
a2a9ebf788 am 80fb21e2: am 74866adc: am adb87527: Merge "Remove startActivityFromInCall API" into lmp-dev 
* commit '80fb21e299f70a09307924b892033f201c173031':
  Remove startActivityFromInCall API
 2014-09-04 00:00:15 +00:00
RoboErik
0d0f67f5ee Update VolumeProvider apis per feedback 
Added currentVolume to constructor.
Removed onGetCurrentVolume and notifyVolume changed.
Added setCurrentVolume and getCurrentVolume.
Updated javadoc to make it clear how they're used.

bug:17258168
Change-Id: I24388aab38824b101ccc18810caa09d46aa7afe0
 2014-09-03 16:29:15 -07:00
David Smith
005038abda Merge "Add RGBA8888 to MediaCodecInfo.CodecCapabilities" 2014-09-03 23:18:14 +00:00
David Smith
5576620c13 Add RGBA8888 to MediaCodecInfo.CodecCapabilities 
Change-Id: I0604aea94702dc81c903b7f5d2715dd078c41ca6
 2014-09-03 15:06:18 -07:00
Selim Gurun
c7a8d06731 Remove unpublished optOutDataReductionProxyApi 
Bug: 17253647

Per Api council's request, remove this API.

Change-Id: I8e706cc7173b88f3f13b2ac0697f54b25f163798
 2014-09-03 14:34:24 -07:00
Nancy Chen
0c76727916 Merge "Update api for onConnectionAdded/Removed" into lmp-dev 2014-09-03 20:51:12 +00:00
Nancy Chen
b5acab4639 Update api for onConnectionAdded/Removed 
Removed methods from public API for previous change.

Bug: 17262026
Change-Id: Ic41eccf8b9c1489b6261758640a35664b39ea819
 2014-09-03 13:33:46 -07:00
Julian Odell
6c25708eb5 Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 2014-09-03 20:20:34 +00:00
Julian Odell
31ef14d4f0 Bug 17262099: MMS API changes (multi-project). 
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
 2014-09-03 13:11:56 -07:00
Evan Charlton
4d12a03771 Merge "Remove startActivityFromInCall API" into lmp-dev 2014-09-03 20:07:47 +00:00
Tyler Gunn
9c7eb7b369 am 01907833: am c1945d0b: am 5cc214b6: Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 
* commit '0190783387f53163613b489e91038d8e06858167':
  Add supported URI scheme to PhoneAccounts. (1/4)
 2014-09-03 19:57:29 +00:00
Esteban Talavera
5fcad0a6b0 resolved conflicts for merge of 82b53329 to master 
Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46
 2014-09-03 19:57:35 +01:00