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

27781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Chabot
412ae2b4df Merge "Fix Framework core tests import of android-common." 2010-08-03 17:59:08 -07:00
Brett Chabot
672079a75a Fix Framework core tests import of android-common. 
android.database.CursorWindowTest#testWriteCursorToWindow (and possibly other
tests) were was failing because it couldn't locate a android-common class.

Fix is to include android-common as a static library, as opposed to a runtime
library.

Change-Id: Iae50cf409e76a85ee79e4af71e9b903d18630078
 2010-08-03 17:28:19 -07:00
Dianne Hackborn
b3cf10ffa8 Add facility to switch to new fragments from preferences. 
Change-Id: I009315b59cf81b4962e9c5a4490f0f82743ed64a
 2010-08-03 17:07:45 -07:00
James Dong
6c8687cf1e am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread 
Merge commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef'

* commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef':
  Add lost frame handling in AudioSource
 2010-08-03 15:52:48 -07:00
Scott Main
e4f6728b2d am fa32a45a: am f2d16bc5: am 5aa4680e: update device dashboard 
Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24'

* commit 'fa32a45af724f675215bff920dd264be4a9aae24':
  update device dashboard
 2010-08-03 15:52:43 -07:00
Steve Howard
c7ad9fa080 am 80782220: am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread 
Merge commit '80782220708fdc8575502ac68c884ddab5c78ac2'

* commit '80782220708fdc8575502ac68c884ddab5c78ac2':
  New secure setting for mobile download size limit.
 2010-08-03 15:52:23 -07:00
Adam Powell
9d67668b9b Merge "Add support for action buttons without an icon." 2010-08-03 15:51:25 -07:00
Alex Sakhartchouk
374b4d9091 Merge "Adding onscreen frame and script time for debugging." 2010-08-03 15:08:01 -07:00
Adam Powell
1f9c7afc5a Add support for action buttons without an icon. 
Change-Id: I026bb7463e7a73419dbaf79950d579ba05d04ea8
 2010-08-03 15:01:31 -07:00
Charles Chen
c619d82796 Merge "Fixing font scale in WindowManagerService. There was a bug that causes WindowManagerService to lose the fontScale setting." 2010-08-03 14:50:09 -07:00
Nipun Kwatra
e618c893eb Merge "Allowing useStillCameraForTimeLapse to be set through MediaRecorder.java" 2010-08-03 13:38:25 -07:00
Casey Burkhardt
0920ba5ef1 Fixing font scale in WindowManagerService. 
There was a bug that causes WindowManagerService to lose
the fontScale setting.

This fix submitted on behalf of Casey Burkhardt.

Change-Id: I3a76de15adf13badc5efca8d620d14c972a96ec4
 2010-08-03 12:22:47 -07:00
Alex Sakhartchouk
6de555001b Adding onscreen frame and script time for debugging. 
Change-Id: I5780092d14d49dae556b9969b937c7768e705a64
 2010-08-03 12:03:16 -07:00
Chet Haase
d4b5020174 Merge "remove offending .pn file to fix build" 2010-08-03 11:58:53 -07:00
Chet Haase
4d031f6cc5 remove offending .pn file to fix build 
Change-Id: I147f7f02e261c963ae93c15cbaab73b06f481f90
 2010-08-03 11:56:27 -07:00
Dianne Hackborn
b1ad5977bc New two-pane mode for PreferenceActivity. 
This introduces a whole new way to use PreferenceActivity, as
a container for PreferenceFragments that the user can switch
between from a list of headers.

Change-Id: I1c79b7c78b86790dc460a1414a999aba5de80628
 2010-08-03 11:18:23 -07:00
Jacek Surazski
ee9907b461 Merge "Add dumping of Running Service reports to ApplicationErrorReports" 2010-08-03 11:08:21 -07:00
Gilles Debunne
d1ce7496f1 Merge "frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi" 2010-08-03 11:01:25 -07:00
Vasu Nori
6cd0cc4606 Merge "random but useful stuff" 2010-08-03 10:50:56 -07:00
Vasu Nori
0732f7912c random but useful stuff 
1. move binding of args to one place - to SQLiteProgram
2. reduce locking time in SQLiteDatabase
3. reduce locking during time of binding of args
4. rmeove test for the deprecated ArrayListCursor
5. a couple of nits here and there

Change-Id: I20c33c8ffe3325df67af655f1d20614f7f727cb7
 2010-08-03 10:48:14 -07:00
Gilles Debunne
389878e49d frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi 
Change-Id: I95c7e6afb84af981867c32fe7f86b140f643b5b9
 2010-08-03 10:47:05 -07:00
Elliott Hughes
5515b54d92 Merge "Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table." 2010-08-03 10:45:35 -07:00
Maksymilian Osowski
5ce600e1dc Merge "Added geolocation layoutTestController functions." 2010-08-03 10:38:12 -07:00
Maksymilian Osowski
38f28fac14 Added geolocation layoutTestController functions. 
Change-Id: Ie9558e873ff589b9e2358623433838f0718ea3b4
 2010-08-03 18:37:17 +01:00
Michael Kolb
508654536c Merge "fixed webkit version number in user agent string" 2010-08-03 10:36:25 -07:00
Maksymilian Osowski
6540c26f58 Merge "Added recording of JS dialog messages." 2010-08-03 10:33:21 -07:00
Michael Kolb
11945d1f47 fixed webkit version number in user agent string 
Change-Id: Ieb0843140a682d35bacc2bd273d7c697f02746a4
 2010-08-03 10:25:07 -07:00
Alex Sakhartchouk
a275354c54 Merge "Adding drop shadow support" 2010-08-03 10:14:51 -07:00
Maksymilian Osowski
40968a4540 Added recording of JS dialog messages. 
Change-Id: I3854f1fea81d47255c9fb398bdcbdff5ed4d8a52
 2010-08-03 18:02:42 +01:00
Robert Greenwalt
fa64bcfb01 Merge "Don't reset connections switching default->hipri" 2010-08-03 09:52:48 -07:00
Makoto Onuki
ec37c88570 Adding a method called when detecting content change. 
Added Loader.onContentChanged()  which is called by ForceLoadContentObserver
when it detects a change, rather than forceLoad().

By default onContentChanged() just calls forceLoad(), so there's no change
in behavior.

This is useful when a subclass wants to perform custom operations upon
data chantes.  For example, a subclass may want to limit the number
of automatic requeries per second.

Change-Id: I493dac3f4f1a75b056d2c7065336ea9252dbf424
 2010-08-03 09:30:47 -07:00
Maksymilian Osowski
100e106551 Merge "Changed the order of searching for expected result (and added additional location)." 2010-08-03 08:05:46 -07:00
Maksymilian Osowski
c83712e686 Changed the order of searching for expected result (and added additional location). 
Change-Id: Ieb59ffcaeb999d0ed5a8445c97e6ea3bbe115e4d
 2010-08-03 16:04:58 +01:00
Maksymilian Osowski
ef7f9d2458 Added wakelock to keep the screen from sleeping when executing tests. 
Change-Id: Ib6a0ff2a7c906f500868269d6a617553733d33b1
 2010-08-03 16:01:50 +01:00
Maksymilian Osowski
19ca35a066 Merge "Added detecting unimplemented layoutTestController functions and green squares." 2010-08-03 07:57:48 -07:00
Maksymilian Osowski
fb60226a03 Merge "First batch of layoutTestController functions + some fixes and tweaks." 2010-08-03 07:57:43 -07:00
Maksymilian Osowski
4a9e3a6dc3 Added detecting unimplemented layoutTestController functions and green squares. 
Change-Id: Iaa7bbdb83a074a874a210f7975c6c3b731e0a924
 2010-08-03 15:35:07 +01:00
Maksymilian Osowski
dd4bff62b5 First batch of layoutTestController functions + some fixes and tweaks. 
Change-Id: I9dae192c498d8e19fd75861a1a6cf1f079ad9c6f
 2010-08-03 15:22:34 +01:00
Jacek Surazski
87d0b2f422 Add dumping of Running Service reports to ApplicationErrorReports 
Change-Id: I5f10bf81af384777da2ac2d2c00463b766a4fb67
 2010-08-03 15:02:12 +02:00
Romain Guy
7768e02973 Merge "Add support for ColorFilters." 2010-08-02 18:50:28 -07:00
Romain Guy
db1938e0e6 Add support for ColorFilters. 
Color filters are fully supported and can be used with shaders.

Change-Id: Id90ccf1c81cb462f2431f366f3f8f710d7971e04
 2010-08-02 18:50:56 -07:00
James Dong
51a260d8c6 am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread 
Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp

* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
  Add lost frame handling in AudioSource
 2010-08-02 18:15:48 -07:00
James Dong
23796e3b62 Merge "Add lost frame handling in AudioSource" into gingerbread 2010-08-02 18:13:54 -07:00
Robert Greenwalt
153b4374d0 Don't reset connections switching default->hipri 
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
do the reset unless both are down.

This will go away when we get the deferred network downing.

bug:2865630
Change-Id: I07729b7776fe5ea129120c688cf7839a55a7ed95
 2010-08-02 18:13:42 -07:00
Alex Sakhartchouk
89a524ac2d Adding drop shadow support 
Change-Id: I9b1b9568d6cebc0761d96ab678b018571f705ae1
 2010-08-02 17:52:30 -07:00
Vasu Nori
532abb6530 add public method in ContentValues to return set of all keys 
why not this method? it is useful and cheap.

Change-Id: I5db96d149b13d26b5359b52515a8eabf033eb000
 2010-08-02 17:46:57 -07:00
Scott Main
fa32a45af7 am f2d16bc5: am 5aa4680e: update device dashboard 
Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp

* commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb':
  update device dashboard
 2010-08-02 17:45:05 -07:00
Scott Main
f2d16bc595 am 5aa4680e: update device dashboard 
Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread

* commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
  update device dashboard
 2010-08-02 17:42:11 -07:00
Scott Main
5aa4680eb0 update device dashboard 
Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a
 2010-08-02 17:38:37 -07:00
Oscar Montemayor
1da47a9401 Merge "Global Proxy changes to proxy class." 2010-08-02 17:02:13 -07:00