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

4996 Commits

Author SHA1 Message Date
Robert Greenwalt
be5e37d579 am fc6cd596: am a16ca5ec: Merge change 27141 into eclair 
Merge commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9'

* commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9':
  Fix ConnectivityManager's handling of apn switch.
 2009-09-27 15:43:08 -07:00
Dianne Hackborn
7fd48b2001 am e42ed5fb: am 05eeeace: Merge change 27178 into eclair 
Merge commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21'

* commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-27 15:42:58 -07:00
Neel Parekh
d42a612ea9 am 1f395a21: am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though). 
Merge commit '1f395a210acfa4b9d368bca4f4709dd7686cf669'

* commit '1f395a210acfa4b9d368bca4f4709dd7686cf669':
  Center name when no status.
 2009-09-27 15:42:00 -07:00
Dianne Hackborn
2ecde7d9ca am 7bae17c6: am 48c84052: Merge change 27162 into eclair 
Merge commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b'

* commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b':
  Fix Activity.overridePendingTransition().
 2009-09-27 15:41:39 -07:00
Neel Parekh
fdb8661c33 am 9a9b97d3: am 35468254: Merge change 26720 into eclair 
Merge commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9'

* commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9':
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-27 15:41:28 -07:00
Fred Quintana
1a85cf6d77 am abd4d965: am 6ecaff15: add a optional String to the key of notifications to allow users to scope them 
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'

* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
  add a optional String to the key of notifications to allow users
 2009-09-27 15:41:20 -07:00
Evan Millar
0c3e1ec152 am c724d2cd: am ed7f0955: Merge change 27150 into eclair 
Merge commit 'c724d2cd198b6ef3226ed415aac349a925a85d9d'

* commit 'c724d2cd198b6ef3226ed415aac349a925a85d9d':
  Fix FasttrackBadgeWidget pressed state.
 2009-09-27 15:40:35 -07:00
Karl Rosaen
9042d5159e am 08fc1b50: am 0cb901c4: Merge change 27076 into eclair 
Merge commit '08fc1b507c388606cf6dcb4523c8cb3766415deb'

* commit '08fc1b507c388606cf6dcb4523c8cb3766415deb':
  Optimize rotary selector widget by using bitmaps instead of drawables.
 2009-09-27 15:39:18 -07:00
Daisuke Miyakawa
a94e377c1e am d4e21df9: am 3ed05574: Merge change 27077 into eclair 
Merge commit 'd4e21df96109c26a00116103567af22ff1e8f8a6'

* commit 'd4e21df96109c26a00116103567af22ff1e8f8a6':
  Two changes toward vCard composer.
 2009-09-27 15:38:12 -07:00
Daniel Sandler
d33205c570 am 032b3bc9: am 228067ac: Merge change 27116 into eclair 
Merge commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc'

* commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc':
  Fix http://b/2131173 (gaps between Gallery tiles).
 2009-09-27 15:38:02 -07:00
Grace Kloba
2aa3313b6c am be3abd73: am 0f5fd893: Merge change 27052 into eclair 
Merge commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8'

* commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8':
  If WebCore doesn't response touch down in time, don't
 2009-09-27 15:37:39 -07:00
Robert Greenwalt
fc6cd59650 am a16ca5ec: Merge change 27141 into eclair 
Merge commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404' into eclair-plus-aosp

* commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404':
  Fix ConnectivityManager's handling of apn switch.
 2009-09-25 17:57:27 -07:00
Android (Google) Code Review
a16ca5ec4b Merge change 27141 into eclair 
* changes:
  Fix ConnectivityManager's handling of apn switch.
 2009-09-25 20:51:00 -04:00
Dianne Hackborn
e42ed5fb1b am 05eeeace: Merge change 27178 into eclair 
Merge commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45' into eclair-plus-aosp

* commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-25 17:28:04 -07:00
Android (Google) Code Review
05eeeacee6 Merge change 27178 into eclair 
* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-25 20:19:59 -04:00
Dianne Hackborn
c1e605eff4 Fix issue #2136448: googleapps crashes while adding 2nd gmail account 
Change-Id: I1dc27959650643bf0c7fd0564719856d7b3efeb1
 2009-09-25 17:18:15 -07:00
Robert Greenwalt
d1aca6aa73 Fix ConnectivityManager's handling of apn switch. 
It was clearing the interfacename when it was needed later in the process - the prevented us
from clearing the route to private dns servers and clearing the flag that this was set.
Consequently future uses would not set the private dns servers (since it thought they were already
set) and our lookups would fail.

bug: 2146929
 2009-09-25 16:43:20 -07:00
Neel Parekh
1f395a210a am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though). 
Merge commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899' into eclair-plus-aosp

* commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899':
  Center name when no status.
 2009-09-25 16:33:11 -07:00
Neel Parekh
6ecacd40dd Center name when no status. 
Also shows the status if exists (not actually hooked up yet though).

Bug: 2138736
 2009-09-25 16:22:26 -07:00
Dianne Hackborn
7bae17c6de am 48c84052: Merge change 27162 into eclair 
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp

* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
  Fix Activity.overridePendingTransition().
 2009-09-25 16:21:02 -07:00
Neel Parekh
9a9b97d3a9 am 35468254: Merge change 26720 into eclair 
Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp

* commit '3546825421cab5330583633ed854134c35d1c08d':
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-25 16:11:46 -07:00
Android (Google) Code Review
48c84052e2 Merge change 27162 into eclair 
* changes:
  Fix Activity.overridePendingTransition().
 2009-09-25 19:11:43 -04:00
Fred Quintana
abd4d965db am 6ecaff15: add a optional String to the key of notifications to allow users to scope them 
Merge commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544' into eclair-plus-aosp

* commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544':
  add a optional String to the key of notifications to allow users
 2009-09-25 16:11:40 -07:00
Dianne Hackborn
8b571a817c Fix Activity.overridePendingTransition(). 
Change-Id: I4ce995bd58efbbedbe4d0d1e9e0d0f4a8e261843
 2009-09-25 16:09:43 -07:00
Android (Google) Code Review
3546825421 Merge change 26720 into eclair 
* changes:
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-25 19:05:10 -04:00
Fred Quintana
6ecaff1583 add a optional String to the key of notifications to allow users 
to scope them
 2009-09-25 16:01:22 -07:00
Evan Millar
c724d2cd19 am ed7f0955: Merge change 27150 into eclair 
Merge commit 'ed7f0955b7a4535c963b0de2b89e41febfd1416e' into eclair-plus-aosp

* commit 'ed7f0955b7a4535c963b0de2b89e41febfd1416e':
  Fix FasttrackBadgeWidget pressed state.
 2009-09-25 15:50:40 -07:00
Android (Google) Code Review
ed7f0955b7 Merge change 27150 into eclair 
* changes:
  Fix FasttrackBadgeWidget pressed state.
 2009-09-25 18:44:25 -04:00
Evan Millar
fd3fdf1309 Fix FasttrackBadgeWidget pressed state. 
Change-Id: Ia71fbcbff527c287d53120bd827a307797f5f3a2
 2009-09-25 15:36:48 -07:00
Karl Rosaen
08fc1b507c am 0cb901c4: Merge change 27076 into eclair 
Merge commit '0cb901c4be24dc1a7bba729afca0bd12ed04ef6c' into eclair-plus-aosp

* commit '0cb901c4be24dc1a7bba729afca0bd12ed04ef6c':
  Optimize rotary selector widget by using bitmaps instead of drawables.
 2009-09-25 14:39:44 -07:00
Android (Google) Code Review
0cb901c4be Merge change 27076 into eclair 
* changes:
  Optimize rotary selector widget by using bitmaps instead of drawables.
 2009-09-25 17:34:35 -04:00
Daisuke Miyakawa
d4e21df961 am 3ed05574: Merge change 27077 into eclair 
Merge commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb' into eclair-plus-aosp

* commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb':
  Two changes toward vCard composer.
 2009-09-25 14:08:45 -07:00
Daniel Sandler
032b3bc9a9 am 228067ac: Merge change 27116 into eclair 
Merge commit '228067ac6ab57aef85a34465b95e0a25c8bbc450' into eclair-plus-aosp

* commit '228067ac6ab57aef85a34465b95e0a25c8bbc450':
  Fix http://b/2131173 (gaps between Gallery tiles).
 2009-09-25 14:04:10 -07:00
Android (Google) Code Review
3ed05574e3 Merge change 27077 into eclair 
* changes:
  Two changes toward vCard composer.
 2009-09-25 17:02:05 -04:00
Android (Google) Code Review
228067ac6a Merge change 27116 into eclair 
* changes:
  Fix http://b/2131173 (gaps between Gallery tiles).
 2009-09-25 16:58:39 -04:00
Grace Kloba
be3abd7334 am 0f5fd893: Merge change 27052 into eclair 
Merge commit '0f5fd893bed202e90617a36bd4ca4211d667c320' into eclair-plus-aosp

* commit '0f5fd893bed202e90617a36bd4ca4211d667c320':
  If WebCore doesn't response touch down in time, don't
 2009-09-25 13:44:48 -07:00
Daniel Sandler
f06018019d Fix http://b/2131173 (gaps between Gallery tiles). 
The artwork had a little too much transparent padding on either side; cleaned
this up so there are exactly 10dip blank pixels on left and right.
 2009-09-25 16:41:54 -04:00
Daisuke Miyakawa
21ac410319 Two changes toward vCard composer. 
- Separate the two cases: mCursor == null and mCursor.getCount() == 0.
- Make error messages viewable from user applications, which enables them to
  translate those messages.

Internal issue number: 2138187, 27103
 2009-09-25 13:30:23 -07:00
Grace Kloba
f58af62211 If WebCore doesn't response touch down in time, don't 
block the UI tap, pan and double tap. Added a time out
(which is same as shortpress time out, 200ms) for how
long we wait for WebCore's response for touch down.

This should fix the problem where pan/touch is not working
all the time when Flash plugin is installed.

Fix http://b/issue?id=2144761
 2009-09-25 12:06:08 -07:00
Karl Rosaen
c8ad6dcb8a Optimize rotary selector widget by using bitmaps instead of drawables. 
In profiling setBounds was expensive.  Time per onDraw from 13.3ms to 6.59ms :)
 2009-09-25 11:35:41 -07:00
Karl Rosaen
d62602047c am ba651297: am 52c37d64: Merge change 27065 into eclair 
Merge commit 'ba651297730a999de136749f4ee83402ce230712'

* commit 'ba651297730a999de136749f4ee83402ce230712':
  Remove vertical separator from landscape layout of pattern lock screen.
 2009-09-25 11:27:00 -07:00
Brad Fitzpatrick
e63eb08352 am 0623e674: am 3219ab4d: Fix typo in Bluetooth docs. 
Merge commit '0623e674d9bb2c739653435c01c2c9b830be8ebd'

* commit '0623e674d9bb2c739653435c01c2c9b830be8ebd':
  Fix typo in Bluetooth docs.
 2009-09-25 11:26:55 -07:00
Cary Clark
4a045a3762 am 6fb27c5a: am 96cfad5d: check for null before calling native webkit from java webview 
Merge commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217'

* commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217':
  check for null before calling native webkit from java webview
 2009-09-25 11:24:51 -07:00
Bryan Mawhinney
5675f5b6f8 am 7e74262a: am 82e62668: Merge change 27038 into eclair 
Merge commit '7e74262ab6b650bd5cca218067de36e42d95952e'

* commit '7e74262ab6b650bd5cca218067de36e42d95952e':
  Redraw search autocomplete dropdown after config change.
 2009-09-25 11:24:20 -07:00
Bjorn Bringert
243d240467 am 079b824c: am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested(). 
Merge commit '079b824cf05bee18447ace93958e8f7edcb2cf61'

* commit '079b824cf05bee18447ace93958e8f7edcb2cf61':
  Better JavaDoc for Activity.onSearchRequested().
 2009-09-25 11:24:11 -07:00
Bryan Mawhinney
c784380d10 am 067e0164: am 42b7af57: Dismiss QSB dialog when doing an in-app global search. 
Merge commit '067e0164cae268098a5305bbfca401d4e917b78b'

* commit '067e0164cae268098a5305bbfca401d4e917b78b':
  Dismiss QSB dialog when doing an in-app global search.
 2009-09-25 11:23:53 -07:00
Dianne Hackborn
cd02a278e4 am c6cfd0b0: am 3e2ac884: Fix/improve issue #2142662: too easy to click a link/item instead of fling 
Merge commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c'

* commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c':
  Fix/improve issue #2142662: too easy to click a link/item instead of fling
 2009-09-25 11:23:26 -07:00
Dianne Hackborn
212770b632 am 7510aba7: am 896b15ab: Merge change 27016 into eclair 
Merge commit '7510aba7a5a1024394be938c7e8b35de785f7355'

* commit '7510aba7a5a1024394be938c7e8b35de785f7355':
  A variety of work on animations.
 2009-09-25 11:23:16 -07:00
Mike Cleron
4b0ee97d67 am f45076dd: am fdf53a46: Merge change 26935 into eclair 
Merge commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d'

* commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d':
  Fix bug 2129190
 2009-09-25 11:22:49 -07:00
Nick Pelly
561837422a am b2209a35: am 1a42cfac: Use LM_SECURE when auth && encrypt. 
Merge commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523'

* commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523':
  Use LM_SECURE when auth && encrypt.
 2009-09-25 11:16:24 -07:00