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

43725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dharmaray Kundargi
8e6c69b092 am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
  Merging the same files on top of tree.
 2011-01-30 16:37:41 -08:00
Jean-Baptiste Queru
64548084ea am ec2cd74e: am 1314bdb2: am e88fa50b: Merge from open-source gingerbread 
* commit 'ec2cd74ee3d43f6d1e6865bf8e576b4b42635a86':
  fix failing thread object run
 2011-01-30 16:35:27 -08:00
Dharmaray Kundargi
75aa290d5d am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
  Merging the same files on top of tree.
 2011-01-30 16:35:03 -08:00
Jean-Baptiste Queru
ec2cd74ee3 am 1314bdb2: am e88fa50b: Merge from open-source gingerbread 
* commit '1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
  fix failing thread object run
 2011-01-30 16:32:44 -08:00
Dharmaray Kundargi
ff8432548e Merge "Merging the same files on top of tree." into honeycomb 2011-01-30 16:32:07 -08:00
Jean-Baptiste Queru
1314bdb2b2 am e88fa50b: Merge from open-source gingerbread 
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
 2011-01-30 16:19:59 -08:00
Adam Powell
c75676f8db am 853f284c: am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb 
* commit '853f284c0b80540cf447af0e6e704d7a05947efd':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
 2011-01-30 16:17:59 -08:00
Dharmaray Kundargi
4e70320521 Merging the same files on top of tree. 
Add support for .m4v Issue 3395600

Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
 2011-01-30 16:17:53 -08:00
Dianne Hackborn
58468459dc am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into honeycomb 
* commit '9e3754ff6dcc81c43708ce0e13c75de836173f64':
  Fix issue #3404571: Commit final APIs
 2011-01-30 16:15:13 -08:00
Adam Powell
853f284c0b am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb 
* commit 'c9cb30837116b138a91b251e5217a644231eebef':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
 2011-01-30 16:14:54 -08:00
Adam Powell
c9cb308371 Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-30 16:12:56 -08:00
Dianne Hackborn
9e3754ff6d am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into honeycomb 
* commit '54ad36119460b850641556a12b845eadc9875cb4':
  Fix issue #3404571: Commit final APIs
 2011-01-30 16:11:36 -08:00
Joe Onorato
60d9d9cdba am 75057b15: am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '75057b1507881625368f76b2f401097b606bd530':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:09:29 -08:00
Joe Onorato
75057b1507 am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '4de68baed4bf18b33dc38f89f25410d3d5edfecf':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:03:59 -08:00
Dianne Hackborn
54ad361194 Merge "Fix issue #3404571: Commit final APIs" into honeycomb 2011-01-30 16:01:36 -08:00
Joe Onorato
4de68baed4 Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 2011-01-30 16:00:52 -08:00
Gilles Debunne
b51ef3c5a1 am 80a3083f: am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '80a3083fdd106b2f839d50e1c861347faa969781':
  Auto-clearing setError popup
 2011-01-30 15:56:41 -08:00
Gilles Debunne
80a3083fdd am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup
 2011-01-30 15:53:03 -08:00
Gilles Debunne
236b987214 Merge "Auto-clearing setError popup" into honeycomb 2011-01-30 15:49:38 -08:00
Adam Powell
65a1de963a Fix bug 3405899 - android.view.WindowManager$BadTokenException 
Clear any pending runnables involved with TextViews when cursor
controllers are released

Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
 2011-01-30 15:47:29 -08:00
Joe Onorato
ac0ee89bd9 Check for the STATUS_BAR permission for the system UI properties. 
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.

Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
 2011-01-30 15:38:30 -08:00
Jean-Baptiste Queru
e88fa50be8 Merge from open-source gingerbread 
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
 2011-01-30 15:30:03 -08:00
Dheeraj Sharma
407a558af5 am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:25:07 -08:00
Dheeraj Sharma
471ebbca5f am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '45911e1969fd1843bac5806e06f351123b67f596':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:22:39 -08:00
Dheeraj Sharma
45911e1969 Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 2011-01-30 15:20:49 -08:00
Jean-Baptiste Queru
65aef1517b Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dheeraj Sharma
085787a402 am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit 'bd633b7297c60771223f0e8799c418cdbce3017c':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:13:31 -08:00
Dheeraj Sharma
bd633b7297 am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit '167e7488af4d53673ff2fcc0723ae2a1584f5194':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:10:25 -08:00
Dheeraj Sharma
167e7488af Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 2011-01-30 15:08:12 -08:00
Jamie Gennis
4453b1a5b6 am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 
* commit '09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9':
  Reset ANativeWindow crop on buffer geometry changes.
 2011-01-30 15:05:42 -08:00
Jamie Gennis
09443aeb64 am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 
* commit '628845056282a0c5b1a212ce5aeeaac092b91ec8':
  Reset ANativeWindow crop on buffer geometry changes.
 2011-01-30 15:03:03 -08:00
Jamie Gennis
6288450562 Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 2011-01-30 15:00:44 -08:00
Dheeraj Sharma
c1a2f40005 3404665 Preview window is blank after returning from playing exported movie 
Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
 2011-01-30 14:52:42 -08:00
Vasu Nori
4b91b4b117 Merge "bug:3385018 don't print finalizer warnings under certain conditions" 2011-01-30 14:45:40 -08:00
Vasu Nori
83ff97d840 bug:3385018 don't print finalizer warnings under certain conditions 
Change-Id: I06c49a464f61c26d3e6645a95f2dd38d444bf384
 2011-01-30 14:42:36 -08:00
Dianne Hackborn
3b024a6d28 Fix issue #3404571: Commit final APIs 
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
 2011-01-30 14:26:31 -08:00
Daniel Sandler
8199741357 am 935275cb: am 71a22b3b: Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 
* commit '935275cbe058f5a60ac2cf1a3321fd49550fd37c':
  Dismiss the ticker early if the status bar is tapped.
 2011-01-30 13:42:52 -08:00
Daniel Sandler
935275cbe0 am 71a22b3b: Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 
* commit '71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd':
  Dismiss the ticker early if the status bar is tapped.
 2011-01-30 13:40:19 -08:00
Daniel Sandler
71a22b3bc7 Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 2011-01-30 13:36:47 -08:00
Joe Onorato
ac6f09140b am aaf75d77: am f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycomb 
* commit 'aaf75d77b1c7ce7296a21db1e3ce23ae93e25817':
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
 2011-01-30 13:22:17 -08:00
Joe Onorato
aaf75d77b1 am f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycomb 
* commit 'f2057d907b5d9c75086337e840f70b5061b2a5aa':
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
 2011-01-30 13:19:57 -08:00
Joe Onorato
f2057d907b Merge changes I09e8c4eb,I91a0e05f into honeycomb 
* changes:
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
 2011-01-30 13:18:16 -08:00
Joe Onorato
0c953f68f5 Use a DateFormat that fits. 
Bug: 3405724
Change-Id: I09e8c4ebf1d0142b8737fc1bf9500dee320332b7
 2011-01-30 13:07:53 -08:00
Daniel Sandler
2ed08d2e70 Dismiss the ticker early if the status bar is tapped. 
Tapping the ticker will still launch the notification's
contentIntent, but tapping anywhere else in the bar will
immediately hide the ticker.

Bug: 3365129
Change-Id: Ic1abd38fd4c5bdf32f3586b4e4aa5b833b11a9bd
 2011-01-30 16:07:28 -05:00
The Android Open Source Project
7f4b66cb92 am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb 
* commit '5f773b9f72367ed8046df257d20881fd96f86929':
  resolved conflicts for merge of a314f32b to honeycomb-merge
 2011-01-30 12:54:18 -08:00
Dheeraj Sharma
9803b8435e Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI 
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
 2011-01-30 12:50:23 -08:00
Jeff Brown
46bfd4a355 resolved conflicts for merge of c608e106 to master 
Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8
 2011-01-30 12:50:09 -08:00
The Android Open Source Project
5f773b9f72 Reconcile gingerbread-plus-aosp and honeycomb 
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
 2011-01-30 12:40:39 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge 
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
 2011-01-30 12:40:38 -08:00
Joe Onorato
99641836d8 Update the network info when the configuration changes. 
Bug: 3405559
Change-Id: I91a0e05f2e6d1c7766b89ba4f96d87ce07783318
 2011-01-30 12:17:27 -08:00