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

48511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
2fae858db5 LayoutLib: implement data binding for most AdapterView 
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
 2011-05-13 15:55:49 -07:00
Dianne Hackborn
28a8bce691 am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:45:23 -07:00
Dianne Hackborn
6824c135fe am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:36:48 -07:00
Dianne Hackborn
f3f2d731e1 Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 2011-05-13 15:33:21 -07:00
Adam Powell
a593d9852f Fix a bug where an action bar could be created when it should not be. 
Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
 2011-05-13 14:09:54 -07:00
Jeff Brown
0d9288d784 am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945 
* commit '2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
  Fix bounds check. Bug: 4413945
 2011-05-13 13:07:44 -07:00
Jeff Brown
2bdb756cdf am 4fb76253: Fix bounds check. Bug: 4413945 
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
  Fix bounds check. Bug: 4413945
 2011-05-13 13:04:28 -07:00
Jeff Brown
4fb76253f2 Fix bounds check. 
Bug: 4413945

Also remove dead code from header file.

Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
 2011-05-13 12:51:12 -07:00
Dianne Hackborn
16f6e89c2a DO NOT MERGE. Integrate fragment work from master 
Back-port new fragment detach APIs from support lib.

This allow a much cleaner implementation of things like the
fragment pager class.

Integrate from support lib: fix restore of list state.

The FragmentManager/ListFragment impl was restoring the list
state before setting its adapter.  This caused the list view to
lose the state, since it gets cleared as part of setting the
adapter.  Now the fragment manager waits on restoring the view
hierarchy state until after it has done onActivityCreated(),
at which point we have set the adapter.

It would be nice to make list view less fragile in this regard,
but that is for a different change.

Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
 2011-05-13 12:42:22 -07:00
Scott Main
78987e0322 docs: update homepage I/O announcement 
Change-Id: If61bfdf40c3b1d0c95b9a2694a849edf5e53bb54
 2011-05-13 11:27:53 -07:00
Dianne Hackborn
2e4a3236a7 am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
 2011-05-13 11:21:26 -07:00
Dianne Hackborn
46a282f323 am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 
* commit '0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
 2011-05-13 11:18:40 -07:00
Dianne Hackborn
0ed2e845db Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 2011-05-13 11:16:42 -07:00
Scott Main
15f8a6a726 am 4c53fc7e: am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 
* commit '4c53fc7ec921c0959f021a475fe0d91b7e6ddc2d':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
 2011-05-13 11:03:27 -07:00
Scott Main
f5c826224b am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806 
* commit '2a959725f569147878b3a78fae77e8679c8e16fa':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
 2011-05-13 11:01:25 -07:00
Scott Main
4c53fc7ec9 am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 
* commit '78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
 2011-05-13 11:00:27 -07:00
Scott Main
2a959725f5 am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806 
* commit 'd32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
 2011-05-13 10:58:29 -07:00
Scott Main
78b875e7e6 am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
 2011-05-13 10:56:52 -07:00
Scott Main
d32aeafc41 am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806 
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
 2011-05-13 10:55:09 -07:00
Scott Main
edab852fe1 Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 2011-05-13 10:54:00 -07:00
Wink Saville
74af525e40 am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE 
* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
  Add getLteOnCdamMode.
 2011-05-13 09:20:08 -07:00
Wink Saville
55ab1ac27f Merge "Add getLteOnCdamMode." into honeycomb-LTE 2011-05-13 09:09:43 -07:00
Dianne Hackborn
ebff8f92f1 DO NOT MERGE. Integrate add new screen width/height in "dp" configs. 
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
 2011-05-12 18:39:51 -07:00
Dianne Hackborn
ec85619f02 am d46849a5: am a8138732: MR2 is going to be API 13. 
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
  MR2 is going to be API 13.
 2011-05-12 17:39:30 -07:00
Dianne Hackborn
dda64e9a4a am 51454295: am df9799f0: Fix build. 
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
  Fix build.
 2011-05-12 17:39:22 -07:00
Irfan Sheriff
91a460469a am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1 
* commit '2cd423a049aeeb0c07f7a556f3a6f701b504606f':
  DO NOT MERGE Add DhcpStateMachine
 2011-05-12 17:37:06 -07:00
Dianne Hackborn
d46849a535 am a8138732: MR2 is going to be API 13. 
* commit 'a8138732a01b92f0a40f72050b74a3bd4cf6d215':
  MR2 is going to be API 13.
 2011-05-12 17:35:35 -07:00
Dianne Hackborn
51454295a5 am df9799f0: Fix build. 
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
  Fix build.
 2011-05-12 17:35:20 -07:00
Irfan Sheriff
2cd423a049 Merge commit '01ea7f01' into manualmerge1 2011-05-12 17:19:56 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13. 
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
 2011-05-12 16:26:47 -07:00
Irfan Sheriff
55fa681ac7 am bb09485b: Merge commit \'09564fbb\' into manualmerge 
* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
  DO NOT MERGE Define Protocol class
 2011-05-12 16:02:43 -07:00
Jean-Baptiste Queru
e03efcb05f am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia" 
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia
 2011-05-12 15:54:13 -07:00
Jean-Baptiste Queru
b0ca8b9dfd am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
  Ninepatch tweaks for better interop
 2011-05-12 15:52:16 -07:00
Jean-Baptiste Queru
fb401ca777 am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:52:12 -07:00
Jean-Baptiste Queru
11ace0015b am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:52:03 -07:00
Irfan Sheriff
bb09485bcb Merge commit '09564fbb' into manualmerge 2011-05-12 15:47:28 -07:00
Jean-Baptiste Queru
2d7d3f78c9 am f247e545: Merge "Adapt to latest skia" 
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
 2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
a84d29cb04 am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
 2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
20fd3f0d83 am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
e8b669cbd7 am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:38:07 -07:00
Dianne Hackborn
df9799f0fc Fix build. 
Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
 2011-05-12 15:16:33 -07:00
Jean-Baptiste Queru
f247e545b5 Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Derek Sollenberger
0ceb9501b2 Adapt to latest skia 
Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
 2011-05-12 15:05:44 -07:00
Teng-Hui Zhu
858daa1fbb am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
 2011-05-12 15:05:29 -07:00
Dianne Hackborn
0e59729b10 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
 2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
a0e661b4e4 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
 2011-05-12 15:01:56 -07:00
Dianne Hackborn
972808164a am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
 2011-05-12 15:01:53 -07:00
Jean-Baptiste Queru
6714e67740 Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
9faa34e603 Ninepatch tweaks for better interop 
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
 2011-05-12 14:22:43 -07:00
Jean-Baptiste Queru
4770c79c34 Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00