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

107410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
0efd4f0215 Merge "Fix typo in View.java javadocs" 2013-05-28 15:45:18 +00:00
Scott Main
5215f43992 am 0b92682d: am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '0b92682d292acd830ac84467178ff417cbb3e699':
  new android studio download v0.1.1
 2013-05-28 08:44:23 -07:00
Scott Main
0b92682d29 am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
  new android studio download v0.1.1
 2013-05-28 08:42:24 -07:00
John Spurlock
44b1edd948 Fix typo in View.java javadocs 
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
 2013-05-28 11:40:58 -04:00
Scott Main
43fa2b8853 am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '718011ac851dcd8925ebeaf4f5516b7b1b62a647':
  new android studio download v0.1.1
 2013-05-28 08:39:42 -07: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
Scott Main
718011ac85 am d4b710c6: new android studio download v0.1.1 
* commit 'd4b710c69800acd0a9237a64e73d62ac9ba3a517':
  new android studio download v0.1.1
 2013-05-28 08:37:35 -07:00
Derek Sollenberger
d7a80774f0 Modifications needed for updating Skia to r9286. 
bug: 8719528
Change-Id: I260fefb93c5a8c5dec86acdec66cbe55a2ee8a92
 2013-05-28 10:44:26 -04:00
The Android Open Source Project
a503315865 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
 2013-05-28 07:37:29 -07:00
John Spurlock
9643d40395 Fix typo in View.java javadocs 
Change-Id: I6da88e18fe32c4763c916990f6aa17dda21f5c8f
 2013-05-28 09:44:50 -04:00
Baligh Uddin
1f12ff9b0e Import translations. DO NOT MERGE 
Change-Id: I258b08e31327bb4b99088338f81217db5ec2d0fb
Auto-generated-cl: translation import
 2013-05-27 10:08:03 -07:00
Baligh Uddin
451b69eee5 Import translations. DO NOT MERGE 
Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import
 2013-05-27 09:55:15 -07:00
Baligh Uddin
bb0a7f5010 Import translations. DO NOT MERGE 
Change-Id: I7d29ef01bf03a1640cabf0a179fc0b05d0e53b3a
Auto-generated-cl: translation import
 2013-05-27 09:53:06 -07:00
Andrew Hsieh
c01e1ed688 Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event 
See b.android.com/55873

Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
 2013-05-27 12:27:10 +08:00
Matthew Xie
e7e6bf9f02 am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101" 
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
 2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
The Android Automerger
f062b2a5d0 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:27 -07: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