Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a7cda03a4747bd224cd304324abc270fa1609bbc
frameworks_base/core/java/android
History
Adam Skory a7cda03a47 resolved conflicts for merge of 7d17de35 to master 
Conflicts:
	core/res/res/values/public.xml

Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
2013-09-11 16:16:19 +01:00
..
accessibilityservice
…
accounts
…
animation
Transition API changes from API council recommendations
2013-09-04 14:46:38 -07:00
annotation
Add @NotNull, @Nullable, and @IntDef/@StringDef annotations
2013-08-15 13:19:25 -07:00
app
resolved conflicts for merge of 7d17de35 to master
2013-09-11 16:16:19 +01:00
appwidget
…
bluetooth
Allow L2CAP sockets
2013-09-06 12:27:12 -07:00
content
resolved conflicts for merge of 7d17de35 to master
2013-09-11 16:16:19 +01:00
database
Rename offer() to add(), remove/hide some APIs.
2013-09-09 17:55:10 -07:00
ddm
Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
2013-08-30 14:40:26 -07:00
debug
…
emoji
…
gesture
Add View constructor that supplies a default style resource
2013-09-09 18:09:13 -07:00
hardware
Merge "camera2: Don't NPE in onStatusChanged" into klp-dev
2013-09-10 19:29:27 +00:00
inputmethodservice
Add View constructor that supplies a default style resource
2013-09-09 18:09:13 -07:00
net
Allow SSL caches to be installed directly on SSLContexts.
2013-09-11 08:49:59 +00:00
nfc
Remove legacy HCE APIs.
2013-09-04 14:49:46 -07:00
os
Fix crash when Looper used after quit.
2013-09-09 16:14:20 -07:00
preference
am 23d6b7b3: am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev
2013-09-10 09:02:43 -07:00
print
Printers for a disappearing print serivce incorrectly removed.
2013-09-06 14:50:22 -07:00
printservice
Add dumping the state of the print sub-system.
2013-09-09 13:15:15 -07:00
provider
Merge "Backup and restore ringtone and notification ringtone" into klp-dev
2013-09-11 00:03:50 +00:00
security
Add argument to binder call to check key types
2013-09-05 13:27:00 -07:00
service
…
speech
Update documentation for speech APIs.
2013-09-10 15:41:47 +01:00
test
…
text
Add View constructor that supplies a default style resource
2013-09-09 18:09:13 -07:00
transition
Fix for transition layout suppression
2013-09-10 11:36:10 -07:00
util
Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev
2013-09-05 22:20:55 +00:00
view
am 9993f8ff: am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
2013-09-10 16:58:06 -07:00
webkit
Add View constructor that supplies a default style resource
2013-09-09 18:09:13 -07:00
widget
am d54529c4: am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev
2013-09-10 13:10:29 -07:00
package.html
…