Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,012 Commits 3 Branches 0 Tags
031def9e8e3ece07182f01ac033e745697125a6e
Commit Graph

13281 Commits

Author SHA1 Message Date
Makoto Onuki
c421b31447 Fix build breakage due to res-id changes 
Change-Id: I3c8160b277e2dac83b433b5454d18b7253f5d0bd
 2016-05-27 16:54:04 -07:00
Bart Sears
ffc8723d88 Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 2016-05-27 23:09:24 +00:00
Bart Sears
f87ee48da9 resolve merge conflicts of 82a8c5f to nyc-mr1-dev 
Change-Id: I7ba17e4b36997684d5f542900a81a03d28228a7a
 2016-05-27 16:02:22 -07:00
Makoto Onuki
04b9aab945 ShortcutManager: Implement get-drawable APIs 
Bug 28594168

Change-Id: I750e800b59dca56877ba78baac808aff93acd19d
 2016-05-27 10:49:17 -07:00
Makoto Onuki
22fcc68e6b ShortcutManager: Support manifest shortcuts 
- Now apps can publish shortcuts via AndroidManifest.xml
(Sample: I5b127150)

- Rename some APIs per API council feedback

- Publishers can now "disable" shortcuts.
(https://docs.google.com/presentation/d/1raUn1QBURDb1yrd6mSmVxII9ezNh3MWukODdtufJ29U/edit#slide=id.g13ef592464_7_39)

Bug 28785283
Bug 28536066

Change-Id: I4a126841e43e40139bb4baa6d0f98ad7b3a75ac1
 2016-05-27 09:40:58 -07:00
Michael Wright
c37fb8aa6e Merge "Finalize resource IDs for N." into nyc-dev 
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: Ied7ef4d95a5ef5ad8100db724a6bc71f916f9f22
 2016-05-27 03:31:15 +00:00
Jonathan Basseri
04c35e78db resolve merge conflicts of 4c04097 to nyc-mr1-dev 
Change-Id: I256514588af20985108f72a5e204811904f87c9c
 2016-05-26 11:41:17 -07:00
Michael Wright
9ed5eefc28 Revert "Finalize resource IDs for N." 
This reverts commit 7c8e76f87d.

Bug: 28810934
Change-Id: I3a61bb0c2364909480045dd40adba6445d6afabd
 2016-05-26 17:38:06 +01:00
Michael Wright
7c8e76f87d Finalize resource IDs for N. 
Bug: 28810934
Change-Id: If68bfb46cc5fa2d5ea0ee613689198e1ea42dce7
 2016-05-26 17:35:28 +01:00
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev 
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
 2016-05-26 15:54:27 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Michael Wright
28984d4d80 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
 2016-05-26 14:38:56 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Jonathan Basseri
8a6561d177 Change how TelephonyManager handles subscriptions. 
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
 2016-05-25 18:49:11 -07:00
Adam Powell
528a5bd466 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
 2016-05-26 01:21:19 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Stephan Linzner
14ba2e78fd Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I4a853b57b8cfbc834e43e050f26bc078c1b4e92c
 2016-05-26 00:32:51 +00:00
TreeHugger Robot
dac0708ea0 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 2016-05-26 00:22:29 +00:00
Derek Tan
e214ff00ea Merge "Per API review, revert the API renaming CL." into nyc-dev 
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
 2016-05-25 23:50:12 +00:00
Adam Powell
43ec62af45 N is API 24 
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
 2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb Merge "Per API review, revert the API renaming CL." into nyc-dev 2016-05-25 23:41:21 +00:00
Stephan Linzner
ebdc157bc0 Un-deprecated Android mock testing APIs 
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.

Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
 2016-05-25 22:54:27 +00:00
Antonio Cansado
f49cbec84c Merge "Cleaning up NetworkStatsManager." into nyc-dev 
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
 2016-05-25 22:25:11 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Jeff Sharkey
19e2f49181 Merge "API council feedback: hide and document." into nyc-dev 
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
 2016-05-25 20:51:07 +00:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Mady Mellor
3425c6c62c Merge "Changes based on API council feedback for performContextClick" into nyc-dev 
am: 7c17e70f2f

* commit '7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
  Changes based on API council feedback for performContextClick

Change-Id: Ief8c3036b93c28b27ba2f117ec656d38a1562fcf
 2016-05-25 19:10:59 +00:00
Mady Mellor
7c17e70f2f Merge "Changes based on API council feedback for performContextClick" into nyc-dev 2016-05-25 19:00:08 +00:00
Derek Tan
818822ad5d Per API review, revert the API renaming CL. 
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."

This reverts commit 3bf26b5605.

Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
 2016-05-25 18:37:05 +00:00
Antonio Cansado
904237f839 Cleaning up NetworkStatsManager. 
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs

Bug:27530098,27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
 2016-05-25 11:07:41 -07:00
Chris Banes
62eec265ee Merge "Fix text appearances not working in colored button styles" into nyc-dev 
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: Ib26212b58dde81eeb222721d39df7ce66502265b
 2016-05-25 18:05:21 +00:00
Chris Banes
163236156f Merge "Fix text appearances not working in colored button styles" into nyc-dev 2016-05-25 17:57:12 +00:00
Julia Reynolds
5bf51f026c Merge changes from topic \'cps\' into nyc-dev 
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
 2016-05-25 17:15:07 +00:00
Julia Reynolds
ad41a6f0de Api updates. 
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
 2016-05-25 13:02:50 -04:00
Mady Mellor
4f3ab93147 Changes based on API council feedback for performContextClick 
Added an overloaded version with (float x, float y).

Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
 2016-05-25 09:52:51 -07:00
Chris Banes
ec39b57e6f Fix text appearances not working in colored button styles 
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.

BUG: 28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
 2016-05-25 16:49:43 +00:00
Jean-Michel Trivi
30979c2c76 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I5842a7067c383d30f610c72c3511a4dfeb90540c
 2016-05-24 21:23:29 +00:00
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00
Jean-Michel Trivi
602dc777c5 Remove deprecated AudioManager.AudioRecordingCallback method 
Remove AudioRecordingCallback.onRecordingConfigChanged(
         AudioRecordingConfiguration[] configs)

Bug 28819230

Change-Id: I3b85bb9313267499ac407099939b5889bdba996b
 2016-05-24 12:11:59 -07:00
Lajos Molnar
674262b7e1 Merge "media: unhide codec levels" into nyc-dev 
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: Ia2c706fe3dda13f759f54d769bac6c9fe6f34587
 2016-05-24 18:56:30 +00:00
Eric Laurent
a30335698c Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I861c0047b33730465c3ceeae1c4072f17b29d804
 2016-05-24 17:43:34 +00:00
Lajos Molnar
6c2e08083a media: unhide codec levels 
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
 2016-05-24 10:24:47 -07:00
Eric Laurent
b143e3de34 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 2016-05-24 17:15:11 +00:00
Eric Laurent
219de73da2 Fix AudioTrack and AudioRecord documentation 
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
 2016-05-23 17:36:43 -07:00
Adrian Roos
6d2e1e45f0 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
 2016-05-23 23:15:29 +00:00
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors 
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
 2016-05-23 14:00:07 -07:00
Jean-Michel Trivi
f2c8fb8620 Merge "Recording activity notification: return list of configuration" into nyc-dev 
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489
 2016-05-23 20:55:58 +00:00
Jean-Michel Trivi
c991879f29 Merge "Recording activity notification: return list of configuration" into nyc-dev 2016-05-23 20:49:30 +00:00