Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,022 Commits 3 Branches 0 Tags
b50ebe3a15cc19d5729964db1978d50b94de71ca
Commit Graph

20022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guang Zhu
17b8ca48ab Merge branch 'readonly-p4-donut' into donut 2009-04-14 16:47:03 -07:00
Guang Zhu
e6f63b1a15 AI 146246: am: CL 146225 Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early. 
Original author: guangzhu
  Merged from: //branches/cupcake/...

Automated import of CL 146246
 2009-04-14 16:45:47 -07:00
Scott Main
a9fe9e21d3 AI 146242: fix the package namespace in the examples; 
delete the old hello-android file
  BUG=1750212

Automated import of CL 146242
 2009-04-14 16:29:14 -07:00
Guang Zhu
7fc3cd6aeb AI 146225: Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early. 
Automated import of CL 146225
 2009-04-14 15:49:35 -07:00
Eric Shienbrood
51b0c74d8d Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Eric Shienbrood
2ecc74f330 AI 146222: Manual merge of 145980 from donutburger => master. 
Automated import of CL 146222
 2009-04-14 15:40:20 -07:00
Mathias Agopian
5f105d38e2 Merge commit 'goog/master' into merge_master 2009-04-14 15:21:33 -07:00
Mathias Agopian
032c85d636 Merge commit 'goog/master_gl' into merge_master 2009-04-14 14:56:34 -07:00
Mathias Agopian
85d7a06826 Merge commit 'goog/master' into merge_master 2009-04-14 14:45:37 -07:00
Android (Google) Code Review
e2393c5792 Merge changes 108,130,131 into donut 
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
 2009-04-14 14:40:02 -07:00
Android (Google) Code Review
4602d022ba Merge change 109 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-14 14:39:51 -07:00
Yu Shan Emily Lau
b3c5b03055 Merge branch 'readonly-p4-master' 2009-04-14 14:33:23 -07:00
Yu Shan Emily Lau
810ec50a1e AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests 
Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
 2009-04-14 14:32:03 -07:00
Android (Google) Code Review
2240eb8bcd Merge change 129 into donut 
* changes:
  Clean up trivial Eclipse warnings and fix whitespace.
 2009-04-14 14:15:22 -07:00
Android (Google) Code Review
be2355988d Merge change 154 into donut 
* changes:
  gps: Add support for bringing up a GSM data connection on demand for SUPL.
 2009-04-14 13:36:33 -07:00
Mike Lockwood
58bda98766 gps: Add support for bringing up a GSM data connection on demand for SUPL. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-14 16:25:07 -04:00
Android (Google) Code Review
b0d4a3502e Merge change 133 into donut 
* changes:
  Initial code for cdma sms encode and decode, in java, with simple tests.
 2009-04-14 13:20:43 -07:00
Android (Google) Code Review
f2aad4a468 Merge change 132 into donut 
* changes:
  Let's do bug #1769910 actually right.
 2009-04-14 13:15:43 -07:00
Android (Google) Code Review
ab6f5c6e86 Merge change 142 into donut 
* changes:
  telephony: Add support for bringing up GSM data connections for GPS SUPL.
 2009-04-14 12:52:28 -07:00
Dan Bornstein
649435a40f Merge branch 'readonly-p4-master' 2009-04-14 12:42:22 -07:00
Dan Bornstein
5a0e535782 AI 146178: am: CL 145970 am: CL 145743 Excise the "de" locale out of testResourceBundles(), leaving a 
TODO and long comment about the situation.
  Original author: danfuzz
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146178
 2009-04-14 12:41:05 -07:00
Brett Chabot
3071177a4a Merge branch 'readonly-p4-master' 2009-04-14 12:39:37 -07:00
Brett Chabot
23d1b4b21c AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest 
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146177
 2009-04-14 12:38:22 -07:00
Eric Fischer
574d89fa04 AI 146175: Import updated translations. 
Automated import of CL 146175
 2009-04-14 12:10:43 -07:00
Lorenzo Colitti
cb1ac4f88f Merge branch 'readonly-p4-master' 2009-04-14 12:10:26 -07:00
Lorenzo Colitti
d86e6ddfc1 AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets. 
Original author: lorenzo

Automated import of CL 146166
 2009-04-14 12:08:54 -07:00
Leon Scroggins
96c27559b0 Merge commit 'goog/master' 2009-04-14 12:06:19 -07:00
Mike Lockwood
42ad56ead4 telephony: Add support for bringing up GSM data connections for GPS SUPL. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-14 14:58:29 -04:00
Android (Google) Code Review
894fa6cc14 Merge change 79 
* changes:
  Squashed commit of the following:
 2009-04-14 11:54:14 -07:00
Leon Scroggins
90402eb626 Merge branch 'readonly-p4-master' 2009-04-14 11:07:14 -07:00
Ramanan Rajeswaran
407d69c826 Merge branch 'readonly-p4-donut' into donut 2009-04-14 11:07:13 -07:00
Leon Scroggins
17c3bfc8c9 AI 146153: Make the TextDialog invisible, so that we only show WebKit's rendering of the textfield, yet we retain the benefits of having the TextDialog. 
Frame.cpp:
  Removed a line that should not be there anyway.  Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor.
  Platform.h:
  Let WebKit draw the cursor.
  RenderThemeAndroid.cpp:
  Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android.
  WebViewCore.cpp:
  Make the focused node's document's focus controller active.  This allows webkit to draw the cursor.
  TextDialog.java:
  Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible.  Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example).  Since we are not drawing, remove onPreDraw, which is no longer necessary.  In onSelectionChanged, pass a message to webkit telling it that the selection has changed.  It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit.  Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged).
  BUG=1781070,1712752,916193,1411370,1160999,1775425,1354814

Automated import of CL 146153
 2009-04-14 10:57:13 -07:00
Ramanan Rajeswaran
c14b0f8295 AI 146145: am: CL 146144 Set default map location for Ireland and South Africa 
Original author: ramanan
  Merged from: //branches/cupcake/...

Automated import of CL 146145
 2009-04-14 10:41:57 -07:00
Ramanan Rajeswaran
77cfbeb51d AI 146144: Set default map location for Ireland and South Africa 
Automated import of CL 146144
 2009-04-14 10:41:03 -07:00
Ramanan Rajeswaran
bd82eedf97 Merge branch 'readonly-p4-donut' into donut 2009-04-14 09:48:58 -07:00
Ramanan Rajeswaran
9909798b8e AI 146129: am: CL 146127 Increase zoom level for NZ default maps location 
Original author: ramanan
  Merged from: //branches/cupcake/...

Automated import of CL 146129
 2009-04-14 09:47:42 -07:00
Ramanan Rajeswaran
67d2f8d777 AI 146127: Increase zoom level for NZ default maps location 
Automated import of CL 146127
 2009-04-14 09:44:55 -07:00
Ramanan Rajeswaran
0f48ad767a Merge branch 'readonly-p4-donut' into donut 2009-04-14 09:34:58 -07:00
Ramanan Rajeswaran
54a7a0d27b AI 146124: am: CL 146123 Change Belfast to Dublin 
Original author: ramanan
  Merged from: //branches/cupcake/...

Automated import of CL 146124
 2009-04-14 09:33:40 -07:00
Ramanan Rajeswaran
a69ab9493c AI 146123: Change Belfast to Dublin 
BUG=1788466

Automated import of CL 146123
 2009-04-14 09:30:00 -07:00
Jack Palevich
e909ae55e3 Add clarifying comment. 
(Primarily as a test of the master_gl branch.)
 2009-04-13 22:03:39 -07:00
Android (Google) Code Review
cdb02c136a Merge change 105 into donut 
* changes:
  Fix crash when mSST is null and change default to GSM.
 2009-04-13 21:37:13 -07:00
Wink Saville
44038aa032 Fix crash when mSST is null and change default to GSM. 2009-04-13 21:15:23 -07:00
Jack Palevich
e88531ce4b Merge commit 'goog/master' into HEAD 2009-04-13 19:52:45 -07:00
Jianhong Jiang
3ca47d101d Squashed commit of the following: 
commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:07:01 2009 -0700

    Change tabs into 4 spaces.

commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:15:23 2009 -0700

    OpenCore 2.02 related changes.
 2009-04-13 19:01:51 -07:00
Tammo Spalink
83917db040 Initial code for cdma sms encode and decode, in java, with simple tests. 
(direct cherry-pick of master 42/42/8)
 2009-04-14 10:01:23 +08:00
Scott Main
19bd253ed3 Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:47:22 -07:00
Scott Main
006d849c69 AI 146029: am: CL 146028 update hello world tutorial for cupcake, including various other edits. 
Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 146029
 2009-04-13 18:46:08 -07:00
Dianne Hackborn
f210d6b75e Let's do bug #1769910 actually right. 
My original implementation was computing averages and medians.  Now we do binning, as requested.  So much simpler, too!  In addition, it fixes a bug where when hoping across activities we were only accounting for the last activity as the total time; now we count the time from the start of the initial activity.

This also includes some reduction and optimization of the activity manager dumpsys output.
 2009-04-13 18:42:49 -07:00
Robert Greenwalt
7dd171d72e Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:36:18 -07:00