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

107188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
525862c776 am 66e596e7: am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService" 
* commit '66e596e788761e1168805304d2f5fc93c1f2fbcd':
  Fix wrong log information in DevicePolicyManagerService
 2013-05-28 13:50:05 -07:00
Dianne Hackborn
aa508bc6db am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit '23b07d5549bf38cfea388b439ac519670be6e7e2':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-28 13:50:02 -07:00
Dianne Hackborn
bbf6ecc981 am 4e73e8a8: am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '4e73e8a817ff99a19ba9ed6fa68754007731406d':
  Fix CalendarView to show the month title properly.
 2013-05-28 13:49:59 -07:00
Dianne Hackborn
f8b8521598 am 89eed125: am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit '89eed125590c6286fa64e9074e95196c8cc4bd27':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-28 13:49:56 -07:00
Dianne Hackborn
56798adf41 am 959b9b39: am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit '959b9b39b4e488b643919fb7a58f2fbbdd70e573':
  Fix documentation of requestCode parameter.
 2013-05-28 13:49:53 -07:00
Dianne Hackborn
d73cb49bc0 am d031f9c7: (-s ours) am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition" 
* commit 'd031f9c7b7f9b28021abe32b0e0be2033dbec0ae':
  Framework/base: Added synchronization block to avoid race condition
 2013-05-28 13:49:50 -07:00
John Spurlock
0efd4f0215 Merge "Fix typo in View.java javadocs" 2013-05-28 15:45:18 +00:00
Craig Mautner
41c0f353c6 Replace mFocusedStack with getFocusedStack() 
mFocusedStack should not be used directly as it may be null. Added
a note to the declaration to remind future self of that.

Fixes bug 9165949.

Change-Id: I8fad428d93b50909be9e7ec51df81149c11313b3
 2013-05-28 08:39:25 -07:00
John Spurlock
9643d40395 Fix typo in View.java javadocs 
Change-Id: I6da88e18fe32c4763c916990f6aa17dda21f5c8f
 2013-05-28 09:44:50 -04:00
Dianne Hackborn
66e596e788 am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService" 
* commit '840f114395652b3d31815ae23302218305b8b780':
  Fix wrong log information in DevicePolicyManagerService
 2013-05-26 00:25:11 -07:00
Dianne Hackborn
840f114395 am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService" 
* commit '7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
  Fix wrong log information in DevicePolicyManagerService
 2013-05-26 00:23:28 -07:00
Dianne Hackborn
7f3ff133c1 Merge "Fix wrong log information in DevicePolicyManagerService" 2013-05-26 07:22:21 +00:00
Dianne Hackborn
23b07d5549 am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit '43861f9de965593340f6a63c270120a7f1a8701c':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-26 00:05:08 -07:00
Dianne Hackborn
4e73e8a817 am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '95b79966934864f1e81329de92562ee387ff5700':
  Fix CalendarView to show the month title properly.
 2013-05-26 00:05:05 -07:00
Dianne Hackborn
89eed12559 am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit 'c73220050efa7420974850ee9a80a965d807c7ce':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-26 00:05:02 -07:00
Dianne Hackborn
959b9b39b4 am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit 'fc09b326da5e35786530777f01cd132d7686a788':
  Fix documentation of requestCode parameter.
 2013-05-26 00:04:59 -07:00
Dianne Hackborn
d031f9c7b7 am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition" 
* commit '087384b0af6fd3912a3d3e32b9ade7e4604e6537':
  Framework/base: Added synchronization block to avoid race condition
 2013-05-26 00:04:57 -07:00
Dianne Hackborn
43861f9de9 am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-26 00:02:46 -07:00
Dianne Hackborn
95b7996693 am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '0a40bef955c937189841b6f1695e8001311758fa':
  Fix CalendarView to show the month title properly.
 2013-05-26 00:02:41 -07:00
Dianne Hackborn
c73220050e am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-26 00:02:37 -07:00
Dianne Hackborn
fc09b326da am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
  Fix documentation of requestCode parameter.
 2013-05-26 00:02:31 -07:00
Dianne Hackborn
087384b0af am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition" 
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition
 2013-05-26 00:02:24 -07:00
Dianne Hackborn
f46449abed Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
Yu Shan Emily Lau
e0e1af0ac6 am 03367e29: am b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 
* commit '03367e2971e095b819f789c999cf03f8b3eec7ae':
  Update test with CamercorderProfile video size.
 2013-05-24 18:55:55 -07:00
Yu Shan Emily Lau
03367e2971 am b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 
* commit 'b830d527deb75a36aa78367026d6631a9b4e1126':
  Update test with CamercorderProfile video size.
 2013-05-24 18:53:47 -07:00
Yu Shan Emily Lau
b830d527de Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 2013-05-25 01:51:40 +00:00
Scott Main
69d692dca9 am 79c53809: am 4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 
* commit '79c538094b99330bd2af37d1f486220643b27e42':
  add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
 2013-05-24 18:20:41 -07:00
Scott Main
79c538094b am 4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 
* commit '4a47f17a9db8fd2b8b17ad10a629216cc3c6333c':
  add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
 2013-05-24 18:18:33 -07:00
Scott Main
4a47f17a9d Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 2013-05-25 01:17:06 +00:00
Romain Guy
ccccc44b13 am ac629ee8: am 529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev 
* commit 'ac629ee86d9e60e35098d8e731a35fc36b3bf3d5':
  TransitionDrawable should not become a LayerDrawable Bug #9057757
 2013-05-24 17:42:41 -07:00
Romain Guy
ac629ee86d am 529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev 
* commit '529a9e391e386aac37ea722d2517d376968b3d31':
  TransitionDrawable should not become a LayerDrawable Bug #9057757
 2013-05-24 17:40:40 -07:00
Romain Guy
529a9e391e Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev 2013-05-25 00:38:26 +00:00
Romain Guy
90e10cc586 TransitionDrawable should not become a LayerDrawable 
Bug #9057757

Calling TransitionDrawable.mutate() would turn it into a LayerDrawable,
causing it to draw all its children on screen at the same time.

Change-Id: I5efa87c43114a9c817719f08890ce41965f3220a
 2013-05-24 17:31:17 -07:00
Dianne Hackborn
2e39f5c5cb Merge "New ArrayMap class." 2013-05-24 23:37:16 +00:00
Dianne Hackborn
f4bf0ae2a7 New ArrayMap class. 
This is a new kind of key/value mapping that stores its data
as an array, so it doesn't need to create an extra Entry object
for every mapping placed in to it.  It is also optimized to reduce
memory overhead in other ways, by keeping the base object small,
being fairly aggressive about keeping the array data structures
small, etc.

There are some unit and performance tests dropped in to some
random places; they will need to be put somewhere else once I
decided what we are going to do with this for the next release
(for example if we make it public the unit tests should go in
to CTS).

Switch IntentResolver to using ArrayMap instead of HashMap.

Also get rid of a bunch of duplicate implementations of binarySearch,
and add an optimization to the various sparse arrays where you can
supply an explicit 0 capacity to prevent it from doing an initial
array allocation; use this new optimization in a few places where it
makes sense.

Change-Id: I01ef2764680f8ae49938e2a2ed40dc01606a056b
 2013-05-24 16:36:14 -07:00
Romain Guy
9bc69f31e5 Merge "Make sure atlas antries can correctly filter/wrap textures" 2013-05-24 23:22:03 +00:00
Romain Guy
a404e16e49 Make sure atlas antries can correctly filter/wrap textures 
The virtual textures would each have their own values for wrapping
and filtering which could lead to conflict and/or extraneous GL
commands being issued.

Change-Id: I64cb59a03e598f46bf645bd1d30fccfa63a07431
 2013-05-24 16:19:19 -07:00
Craig Mautner
18f8530486 Merge "Convert API refs to StackBox from ActivityStack." 2013-05-24 23:14:52 +00:00
Craig Mautner
5a449154d1 Convert API refs to StackBox from ActivityStack. 
- Removed IActivityManager.getStacks() since getStackBoxes() is better.
- Made createStacks operate relative to StackBox instead of TaskStack.
- Made resizeStack into resizeStackBox.

Change-Id: I7a0e1f4e34f399b4fd1180c60cc3989f9c2433f3
 2013-05-24 16:12:57 -07:00
The Android Open Source Project
6b23af099a am d607b9c7: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'd607b9c725d8a080842e5969b2d6001249ad88cd':
  Use the old interface when resetting connections
  Fix account filtering for specific package name
 2013-05-24 15:30:19 -07:00
The Android Open Source Project
d607b9c725 Reconcile with jb-mr2-release - do not merge 
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
 2013-05-24 15:28:19 -07:00
Scott Main
4f057ffa2a am c8516380: am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 
* commit 'c8516380924863f181e3ad66c1069f1da9c52f11':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
 2013-05-24 14:45:33 -07:00
Scott Main
c851638092 am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 
* commit 'eebec7b1fe68cef9c4feed1f56af2592b402a629':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
 2013-05-24 14:42:58 -07:00
Scott Main
eebec7b1fe Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 2013-05-24 21:40:45 +00:00
Scott Main
509267d618 add links to orientation flags in attribute docs 
to help determine the supported API level for each value
and update the manifest reference page with new attributes

Change-Id: I583a9b3f3be759be71044533055dec26e3616b72
 2013-05-24 14:32:14 -07:00
Alan Viverette
8d7b3d1eb1 am 4026a797: (-s ours) am 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 
* commit '4026a797bcc37c600dcb4cd229ef17b7d3bb0711':
  DO NOT MERGE. Fix number picker accessibility focus.
 2013-05-24 14:24:25 -07:00