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

30849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
9305647eb6 Plumb lights out mode through from the window manager to the status bar running in the system ui process. 
Lights out mode itself isn't implemented.

Change-Id: Ieeef0eb9ae5be23000f770e74e8ee66472f4c673
 2010-09-12 13:25:06 -04:00
Jean-Baptiste Queru
5af8c63e48 am ec06144c: am 36edb202: Merge "Make DRM libraries optional" 
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional
 2010-09-12 08:59:29 -07:00
Jean-Baptiste Queru
ec06144c9d am 36edb202: Merge "Make DRM libraries optional" 
Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp

* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
  Make DRM libraries optional
 2010-09-12 08:57:07 -07:00
Romain Guy
0ce6c0f82d am 405f537a: am 89e05fd5: Merge "Fix the layouting of the checkbox." 
Merge commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108'

* commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108':
  Fix the layouting of the checkbox.
 2010-09-12 08:47:40 -07:00
Romain Guy
405f537a47 am 89e05fd5: Merge "Fix the layouting of the checkbox." 
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp

* commit '89e05fd560e3347070a55260b7aaec3db5647442':
  Fix the layouting of the checkbox.
 2010-09-12 08:44:37 -07:00
Jean-Baptiste Queru
daa23af13b am fe1d52d5: resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp 
Merge commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f'

* commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f':
  Memory leak in TextKeyListener.
 2010-09-12 08:43:53 -07:00
Jean-Baptiste Queru
36edb2028a Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00
Jean-Baptiste Queru
fe1d52d572 resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp 
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
 2010-09-12 08:35:04 -07:00
Romain Guy
89e05fd560 Merge "Fix the layouting of the checkbox." 2010-09-11 14:06:07 -07:00
Romain Guy
01937f63dc Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Kristian Monsen
9b3f11408b Merge WebKit at r66666 : Update User Agent string with new webkit version. 
Change-Id: Id3f9748b806e58f9a8d79553ceff8859eda7c49f
 2010-09-11 12:10:00 +01:00
Nipun Kwatra
522632cde5 Exposing specific profile levels + hasProfile(). 
- Exposing the specific resolution profile levels
  QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles
  QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}
- Unhiding the hasProfile() function used to test if a given profile exists.

Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
 2010-09-10 18:01:46 -07:00
Chet Haase
5976d24d6f Merge "Make fragment animations work when fragments go away" 2010-09-10 17:45:03 -07:00
Chet Haase
b20db3ec34 Make fragment animations work when fragments go away 
Change-Id: I136de6ef910cc02b8181fcfa065bdb0770841396
 2010-09-10 17:43:04 -07:00
Winson Chung
28d8fda9d8 Merge "-> Fixing some layout issues in StackView -> Made the highlight width depend on the screen density" 2010-09-10 17:25:44 -07:00
Jean-Baptiste Queru
f0257c5973 am b387571c: am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'b387571c42aa08b5b9aa9833edb94c16a623e535'

* commit 'b387571c42aa08b5b9aa9833edb94c16a623e535':
  Fix number counter will keep going after window losed focus.
 2010-09-10 17:24:34 -07:00
Jean-Baptiste Queru
b387571c42 am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp

* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
  Fix number counter will keep going after window losed focus.
 2010-09-10 16:39:35 -07:00
Jaikumar Ganesh
547705d3ef am b9871461: am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'b987146123879217a6cdcdfeffdddd917edb22cc'

* commit 'b987146123879217a6cdcdfeffdddd917edb22cc':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:23:24 -07:00
Jean-Baptiste Queru
2088fb0191 am 03821dc6: am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 
Merge commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3'

* commit '03821dc6ea9f96e2b420ab327b727fdcefd880d3':
  Allow two SurfaceViews inbetween the app and the wallpaper.
 2010-09-10 16:23:17 -07:00
Jean-Baptiste Queru
8485fedfeb am d77b0dfd: am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855'

* commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 16:22:27 -07:00
Jean-Baptiste Queru
ca6de93a9d Merge "Fix number counter will keep going after window losed focus." 2010-09-10 16:13:13 -07:00
Adam Cohen
dfcdddd7c4 -> Fixing some layout issues in StackView 
-> Made the highlight width depend on the screen density

Change-Id: I6b3ae68de5fb90728938a7e0869cf97e816aa6af
 2010-09-10 16:11:40 -07:00
Brad Fitzpatrick
082b8334b6 Merge "Fix build caused by automerger and missing imports in master." 2010-09-10 16:05:13 -07:00
Brad Fitzpatrick
c74a1b4414 Fix build caused by automerger and missing imports in master. 
gingerbread had an import android.os.*.  master doesn't.  auto-merger
applied it fine, but it doesn't compile.

Change-Id: I28d7b5053616a40223eeb29a0669831d5ca76d9e
 2010-09-10 16:03:29 -07:00
Amith Yamasani
971e1c64e2 Merge "SearchView API" 2010-09-10 16:01:40 -07:00
Jaikumar Ganesh
b987146123 am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp

* commit 'e442fb6c9215fc6329522915805a9582ec2c3323':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:01:19 -07:00
Amith Yamasani
733cbd58cb SearchView API 
Implements the basic requirements for in-app search. More work to be done.
 2010-09-10 16:00:12 -07:00
Jaikumar Ganesh
e442fb6c92 Merge "Register ServiceStateChanged to CallManager." into gingerbread 2010-09-10 15:54:19 -07:00
Jean-Baptiste Queru
03821dc6ea am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 
Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp

* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
  Allow two SurfaceViews inbetween the app and the wallpaper.
 2010-09-10 15:47:34 -07:00
Jean-Baptiste Queru
d77b0dfdf3 am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp

* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 15:47:27 -07:00
Adam Powell
6b3ea95171 Merge "Allow the theme to affect action bar menus" 2010-09-10 15:43:08 -07:00
Adam Powell
b3f245c30c Allow the theme to affect action bar menus 
Change-Id: Ie914881de626415886289e830fb1ff166ce13159
 2010-09-10 15:40:49 -07:00
John Wang
d028bd0a5f Register ServiceStateChanged to CallManager. 
Change-Id: I216bac222e1bfd93ad36c0aeafa85c232dd60abe
 2010-09-10 15:23:21 -07:00
Gilles Debunne
1acd520326 am ddea348d: am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread 
Merge commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0'

* commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
  Changed menu and expandedMenu background color to dark.
 2010-09-10 15:07:33 -07:00
Brad Fitzpatrick
0b29554188 am 37fc8cc7: am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 
Merge commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd'

* commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd':
  Enable strictmode logging in system_server & add a lock.
 2010-09-10 15:07:20 -07:00
Jesse Wilson
b05766a051 am 30f163e4: am 86333015: Merge "Delete AWT from frameworks/base." into gingerbread 
Merge commit '30f163e4d9c4f75c3493200c29f8f333ab3de07b'

* commit '30f163e4d9c4f75c3493200c29f8f333ab3de07b':
  Delete AWT from frameworks/base.
 2010-09-10 15:06:54 -07:00
Joe Onorato
f0203313ed am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE 
Merge commit '38f75b97d92508633c69eb6461efd353a61dab96'

* commit '38f75b97d92508633c69eb6461efd353a61dab96':
  This was already deprecated, but not picked up by the tool DO NOT MERGE
 2010-09-10 15:06:40 -07:00
Jean-Michel Trivi
82786f8aa7 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-10 15:06:38 -07:00
Nipun Kwatra
55d39f2066 Merge "Adding hasProfile." 2010-09-10 15:04:17 -07:00
Eric Fischer
888e51e3bf am e7be8e8f: (-s ours) am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df'

* commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df':
  Import revised translations.  DO NOT MERGE
 2010-09-10 15:02:41 -07:00
Brett Chabot
e8ce130de1 am 0194eeab: am 4940ff85: Update to new ddmlib-prebuilt api. 
Merge commit '0194eeabfe2cef825f3e91144529be6644ef84c0'

* commit '0194eeabfe2cef825f3e91144529be6644ef84c0':
  Update to new ddmlib-prebuilt api.
 2010-09-10 15:02:01 -07:00
Xavier Ducrohet
f14fafdb7d am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used" 
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'

* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
  Avoid pre-processing images when they won't be used
 2010-09-10 15:01:56 -07:00
Jean-Baptiste Queru
5d77928f32 am e3dabc4b: am beeb71df: fix build 
Merge commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72'

* commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72':
  fix build
 2010-09-10 15:01:50 -07:00
Jean-Baptiste Queru
e4529bf228 am 03b3eda2: am 862438eb: fix build 
Merge commit '03b3eda2f87bc2d837586303585321f073ef5c6a'

* commit '03b3eda2f87bc2d837586303585321f073ef5c6a':
  fix build
 2010-09-10 15:00:34 -07:00
Jean-Baptiste Queru
99206fe173 am 3b3d2160: am 7547b8ea: fix build 
Merge commit '3b3d2160b7c8a17f44476d34408296264d57f2cc'

* commit '3b3d2160b7c8a17f44476d34408296264d57f2cc':
  fix build
 2010-09-10 15:00:12 -07:00
Jean-Baptiste Queru
a411cb81f0 am 6fc97b35: am 93548db6: fix build 
Merge commit '6fc97b35008b9df10085ee24ca71ec58fc2f74ae'

* commit '6fc97b35008b9df10085ee24ca71ec58fc2f74ae':
  fix build
 2010-09-10 15:00:03 -07:00
Joe Onorato
9c11ef3c14 am ebdac324: (-s ours) am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 
Merge commit 'ebdac324a8c65ade0f558fdf1a7f33aa0149470d'

* commit 'ebdac324a8c65ade0f558fdf1a7f33aa0149470d':
  Make @deprecated without a comment an error DO NOT MERGE
 2010-09-10 14:52:21 -07:00
Joe Onorato
8006f342c7 am fb71733b: am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 
Merge commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5'

* commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5':
  Fix the last remaining @deprecated tag without comment warning.
 2010-09-10 14:52:11 -07:00
Scott Main
8ca8ff106a am 4cf0f45d: am 3b202844: am 51c18989: docs: update platform dashboard 
Merge commit '4cf0f45d6589d671be443471ea706bc7f299fbf1'

* commit '4cf0f45d6589d671be443471ea706bc7f299fbf1':
  docs: update platform dashboard
 2010-09-10 14:51:23 -07:00
Wink Saville
e0fc8f4214 am 8d8fce88: (-s ours) am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread 
Merge commit '8d8fce88217f8c4ddd3763e230887cb2359c1a1f'

* commit '8d8fce88217f8c4ddd3763e230887cb2359c1a1f':
  Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
 2010-09-10 14:51:14 -07:00