Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

16870 Commits

Author SHA1 Message Date
Ramanan Rajeswaran
0862395395 AI 146536: am: CL 146129 am: CL 146127 Increase zoom level for NZ default maps location 
Original author: ramanan
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146536
 2009-04-16 12:46:47 -07:00
Mathias Agopian
402c34649f fix some issues with Surface's lifetime management. 
To deal with Java's lack of destructors and delayed garbage collection, we used to duplicate Surface.cpp objects in some case; this caused some issues because Surface is supposed to be reference-counted and unique.
 2009-04-16 12:29:34 -07:00
Eric Fischer
afa2add8ba AI 146517: Import translation changes. 
DO NOT MERGE

Automated import of CL 146517
 2009-04-16 11:01:05 -07:00
Android (Google) Code Review
7a430cf152 Merge change 195 
* changes:
  Make webkit's cursor draw at the correct times.
 2009-04-16 06:21:10 -07:00
Tammo Spalink
e564b19ed2 replaced integer * and % with shift operations, for performance 2009-04-16 14:48:19 +08:00
Eric Fischer
c56eed910a AI 146365: Import revised translations. 
DO NOT MERGE

Automated import of CL 146365
 2009-04-15 13:30:18 -07:00
Leon Scroggins
63dda1c7b4 Make webkit's cursor draw at the correct times. 
This change is dependent on another change to external/webkit.  Tell the WebViewCore to change its FocusController's "active" status depending upon whether the WebView has focus.  This fixes a bug where we were showing the blinking cursor when the WebView was not in focus.
 2009-04-15 13:25:00 -04:00
The Android Open Source Project
5e8c31ac31 Merge commit 'korg/cupcake' 2009-04-14 18:18:03 -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
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
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
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
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
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
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
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
Eric Shienbrood
308618fa9d Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:14:07 -07:00
Eric Shienbrood
9900127828 AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants 
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  Original author: ers
  Merged from: //branches/cupcake/...

Automated import of CL 145980
 2009-04-13 18:12:47 -07:00
Dave Bort
34f1ca7b79 util/DebugUtils: Remove references to android.util.Config 
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
 2009-04-13 17:18:45 -07:00
Dave Bort
76c0226008 text: Remove references to android.util.Config 
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
 2009-04-13 17:17:21 -07:00
Eric Fischer
15b7e5479d AI 146037: Import updated translations. 
Automated import of CL 146037
 2009-04-13 17:16:19 -07:00
Jeffrey Sharkey
269ba974fb Merge branch 'readonly-p4-master' 2009-04-13 16:58:42 -07:00
Jeffrey Sharkey
3ff7eb92ad AI 146012: am: CL 145860 am: CL 145568 Hide setStarted() from public API. 
It should be renamed to something more meaninful before being exposed.
  Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146012
 2009-04-13 16:57:28 -07:00
Dianne Hackborn
81ddb7929f Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dianne Hackborn
b3cddae499 AI 146011: am: CL 145859 am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive). 
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146011
 2009-04-13 16:54:00 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut. 
Automated import of CL 145994
 2009-04-13 16:11:55 -07:00
Dave Bort
b1d0403c66 Remove references to android.util.Config 
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
 2009-04-13 15:12:30 -07:00
Dave Bort
42bc2ff5d2 Remove references to android.util.Config 
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
 2009-04-13 15:10:38 -07:00
Mathias Agopian
77307ab848 Merge commit 'goog/master' into master_gl 2009-04-13 14:31:08 -07:00
Android (Google) Code Review
61805637e5 Merge change 65 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-13 14:13:14 -07:00
Android (Google) Code Review
2ee5b4d82b Merge change 64 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-13 14:13:00 -07:00
Grace Kloba
0f87ca2037 Merge branch 'readonly-p4-master' 2009-04-13 14:05:40 -07:00
Grace Kloba
b3230cb1e3 AI 145922: Fix #1640053, #1777704. When WebKit set scroll position through jni, we need to check whether there is a pending draw as the scroll position should be based on the new picture, not the current picture. 
BUG=1640053,1777704

Automated import of CL 145922
 2009-04-13 14:04:23 -07:00
Lorenzo Colitti
b7c3675aef Merge branch 'readonly-p4-donut' into donut 2009-04-13 13:54:13 -07:00
Lorenzo Colitti
e8624dd69d AI 145920: Don't filter out IPv6 multicast packets. 
Automated import of CL 145920
 2009-04-13 13:52:55 -07:00