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

30395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
aa60a02f79 Added "Memory observability" to javadoc. 
Change-Id: I4fba91922f033af408903cc4b455daa291e3f6ac
 2010-09-08 10:06:19 -07:00
Makoto Onuki
5c3ae02d10 Merge "Add getApplicationContext to the mock implementation." 2010-09-07 15:59:07 -07:00
Makoto Onuki
1006c842f1 am 3f6e4d56: am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 
Merge commit '3f6e4d56bba393ac556a672202e00bc417784ce8'

* commit '3f6e4d56bba393ac556a672202e00bc417784ce8':
  Don't fall through from TOKEN_EMAIL_LOOKUP
 2010-09-07 15:16:44 -07:00
Dianne Hackborn
d0438da05c am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread 
Merge commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1'

* commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1':
  Fixes to battery stats debug output.
 2010-09-07 15:16:38 -07:00
Dianne Hackborn
6aa616c94a am 05dff838: am 11bbe200: Hopefully fix the build. 
Merge commit '05dff838946abb01caa3c3172cf0f367964a0b6d'

* commit '05dff838946abb01caa3c3172cf0f367964a0b6d':
  Hopefully fix the build.
 2010-09-07 14:48:28 -07:00
Dianne Hackborn
4970675316 am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread 
Merge commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'

* commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
  Add system property to turn off scheduling groups.
 2010-09-07 14:47:51 -07:00
Makoto Onuki
3f6e4d56bb am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
 2010-09-07 14:34:19 -07:00
Makoto Onuki
1cc86da61a Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Makoto Onuki
8e34203c41 Add getApplicationContext to the mock implementation. 
So that it'll be compatible with Loaders, which uses this method.
(Otherwise MockContext.getApplicationContext(), which just throws
an exception, will be used.)

Change-Id: I529b60466cf086b514fcddbef4583d1c5b750b9c
 2010-09-07 14:27:25 -07:00
Andreas Huber
babb35ed75 Merge "Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead." 2010-09-07 14:17:49 -07:00
Dianne Hackborn
75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread 
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
 2010-09-07 14:15:17 -07:00
Andreas Huber
94e6b66237 Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead. 
Change-Id: Ia45887df82d66f393520e5a4308f430010402d5e
related-to-bug: 2976248
 2010-09-07 14:11:47 -07:00
Dianne Hackborn
6e86915e8f Merge "Fixes to battery stats debug output." into gingerbread 2010-09-07 14:10:38 -07:00
Dianne Hackborn
b5e3165129 Fixes to battery stats debug output. 
Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
 2010-09-07 14:09:36 -07:00
Vasu Nori
2e8b36cc01 Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff" 2010-09-07 13:23:28 -07:00
Vasu Nori
422dad0f50 android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff 
Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
 2010-09-07 12:56:57 -07:00
Romain Guy
018b0d2918 Merge "Use static final debug fields." 2010-09-07 12:42:43 -07:00
Romain Guy
5429e1d102 Use static final debug fields. 
Change-Id: I304c39f54f609729bcec581091f285b2baa6fefa
 2010-09-07 12:39:45 -07:00
Dianne Hackborn
05dff83894 am 11bbe200: Hopefully fix the build. 
Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp

* commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
  Hopefully fix the build.
 2010-09-07 12:36:33 -07:00
Adam Cohen
cf393c52f9 Merge "-> Implemented new visualization for StackView -> Cleaning up the method for creating the blue outline -> Reimplmented onMeasure for StackView and AdapterViewAnimator" 2010-09-07 12:32:45 -07:00
Dianne Hackborn
11bbe200cb Hopefully fix the build. 
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
 2010-09-07 12:32:19 -07:00
Alex Sakhartchouk
aa860df538 Merge "Fixing a3d files to reflect the new element structure." 2010-09-07 12:13:15 -07:00
Alex Sakhartchouk
65cb3bae15 Merge "Add arrays to elements." 2010-09-07 12:13:07 -07:00
Alex Sakhartchouk
db6f11bd30 Fixing a3d files to reflect the new element structure. 
Change-Id: I44d95c9411706813dde815c5f052f3615e8b483e
 2010-09-07 12:10:18 -07:00
Jason Sams
70d4e50242 Add arrays to elements. 
Change-Id: I624b03bfc1fd26136afd9305a96026b91b1fad3c
 2010-09-07 12:06:05 -07:00
Romain Guy
e04a3811f2 Merge "Temporarily disable fading edges if solidColor=0 and hw is on." 2010-09-07 12:02:38 -07:00
Romain Guy
14cd0653e4 Temporarily disable fading edges if solidColor=0 and hw is on. 
Change-Id: I430d8d4d00cbabc99644b98ea832460339c196d8
 2010-09-07 12:01:38 -07:00
Joe Onorato
1a2736468b Merge "resolved conflicts for merge of 07990cf2 to master" 2010-09-07 11:54:27 -07:00
Joe Onorato
935865923f resolved conflicts for merge of 07990cf2 to master 
Change-Id: I62cc2d14820e4cbe80ea433caf323be2df1fb9a8
 2010-09-07 14:53:46 -04:00
Michael Kolb
d9b447ca28 Merge "Add setting for on screen zoom buttons enables to use pinch to zoom without showing the on screen buttons" 2010-09-07 11:50:54 -07:00
Michael Kolb
6fe3b421fd Add setting for on screen zoom buttons 
enables to use pinch to zoom without
  showing the on screen buttons

Change-Id: Ifd08d11232e2a32178a89e559b6f1f645bf627b9
 2010-09-07 11:46:57 -07:00
Dianne Hackborn
b8bcfed552 am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread 
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
  Add system property to turn off scheduling groups.
 2010-09-07 11:30:08 -07:00
Dianne Hackborn
f703b77c96 Merge "Add system property to turn off scheduling groups." into gingerbread 2010-09-07 11:27:26 -07:00
Dianne Hackborn
84bb52ed61 Add system property to turn off scheduling groups. 
Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
 2010-09-07 11:19:11 -07:00
Joe Onorato
07990cf209 am 1f689f7e: Merge "When notifications are updated, don\'t re-show the ticker unless the text has changed." into gingerbread 
Merge commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp

* commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d':
  When notifications are updated, don't re-show the ticker unless the text has changed.
 2010-09-07 11:18:46 -07:00
Brad Fitzpatrick
cbf16ebdab am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 
Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1'

* commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
 2010-09-07 11:18:39 -07:00
Brad Fitzpatrick
c19c9e4ee2 am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
 2010-09-07 11:15:01 -07:00
Joe Onorato
1f689f7e35 Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread 2010-09-07 11:14:56 -07:00
Eric Fischer
e2a537f235 am aab73757: (-s ours) am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 
Merge commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463'

* commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463':
  Preserve old translations for changed strings.  DO NOT MERGE
 2010-09-07 11:14:28 -07:00
Joe Onorato
da69552078 When notifications are updated, don't re-show the ticker unless the text has changed. 
Bug: 2963867
Change-Id: I24b5bc958fb6eb0d753c88178a385232c75ea438
 2010-09-07 14:13:12 -04:00
Brad Fitzpatrick
b1104b3713 Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 2010-09-07 11:12:51 -07:00
Eric Fischer
aab7375799 am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp

* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
  Preserve old translations for changed strings.  DO NOT MERGE
 2010-09-07 11:08:19 -07:00
Eric Fischer
745e751b25 Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:03:26 -07:00
Steve Block
85a033af1a Merge "Adds a test case for WebAddress where the path component does not have a leading slash" 2010-09-07 10:59:18 -07:00
Steve Block
8bb37f7ffb Adds a test case for WebAddress where the path component does not have a leading slash 
When a URL is malformed because the path does not start with a slash,
we assume that the path starts with the first character that is not
valid in the host and insert a leading slash. This is the reason why
the regex for the path component does not force a leading slash.

Bug: 1011602
Change-Id: I8efe46c058d2ee2d1a6a4406ee25dc021315222b
 2010-09-07 18:57:41 +01:00
Kenny Root
c99b2b857c am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 
Merge commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6'

* commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6':
  Use new nativeLibraryPath field for NativeActivity
 2010-09-07 10:52:13 -07:00
Kenny Root
f17bd19acb am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
 2010-09-07 10:49:22 -07:00
Makoto Onuki
a362e1d794 Don't fall through from TOKEN_EMAIL_LOOKUP 
Change-Id: Ifc08f26ba93496cfa53cd83c7df0e986ea4ece4b
 2010-09-07 10:46:59 -07:00
Kenny Root
2cb3e83654 Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 2010-09-07 10:46:14 -07:00
Kenny Root
6798b62e92 Use new nativeLibraryPath field for NativeActivity 
Instead of being naughty and guessing the native library path from
dataDir, use the new nativeLibraryPath field because it can be on SD
card now.

Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
 2010-09-07 10:44:21 -07:00