Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,353 Commits 3 Branches 0 Tags
d42a612ea9816d010353e2b6336b55ae17d51236
Commit Graph

4145 Commits

Author SHA1 Message Date
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
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
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
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
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
Android (Google) Code Review
3ed05574e3 Merge change 27077 into eclair 
* changes:
  Two changes toward vCard composer.
 2009-09-25 17:02:05 -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
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
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
a0c1abcef6 am a7e508eb: am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable. 
Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'

* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
 2009-09-25 11:16:17 -07:00
Fred Quintana
120d132475 am 63344cae: am 91a00d3a: fix typo 
Merge commit '63344cae94520d789dbe4002dcc3d6ef45d9a040'

* commit '63344cae94520d789dbe4002dcc3d6ef45d9a040':
  fix typo
 2009-09-25 11:14:38 -07:00
Fred Quintana
e2f2df4041 am 5dfe9f15: am f5808415: rename misc to birthday 
Merge commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff'

* commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff':
  rename misc to birthday
 2009-09-25 11:14:31 -07:00
Daisuke Miyakawa
de6bbe7fc1 am 2f24ab9f: am 4579ed28: Merge change 26944 into eclair 
Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d'

* commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d':
  Add "TYPE=" to type attribute when appropriate.
 2009-09-25 11:13:53 -07:00
Wei Huang
4e8804fa54 am 8feefb3e: am d35db5ec: Merge change 26946 into eclair 
Merge commit '8feefb3e2067cc7d3c5b9c3b776538f264782021'

* commit '8feefb3e2067cc7d3c5b9c3b776538f264782021':
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
 2009-09-25 11:13:43 -07:00
Daisuke Miyakawa
0b43103b46 am 5b774984: am b7e89e4c: Merge change 26912 into eclair 
Merge commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c'

* commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c':
  Add appendType() utility method.
 2009-09-25 11:12:11 -07:00
Nicolas Roard
13e8d6e016 am 08228fda: am dccf22dc: Merge change 26698 into eclair 
Merge commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae'

* commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae':
  Fix the shortcuts
 2009-09-25 11:11:37 -07:00
Bryan Mawhinney
753bc00f15 am cbafa094: am dfb7bc8c: Merge change 26821 into eclair 
Merge commit 'cbafa094449f9e6646409b6bd26ba11956b32047'

* commit 'cbafa094449f9e6646409b6bd26ba11956b32047':
  Make removeOnAccountsUpdateListener cope with null handlers.
 2009-09-25 11:11:31 -07:00
Fred Quintana
d0bde7ba9b am 93bc8cab: am 531e580a: remove the incorrectly located nickname 
Merge commit '93bc8cab98784851b1bb080b57d059ac35fa619a'

* commit '93bc8cab98784851b1bb080b57d059ac35fa619a':
  remove the incorrectly located nickname
 2009-09-25 11:11:22 -07:00
Grace Kloba
a0c2e57cc3 am 9f9a0ad5: am f4a36e86: Merge change 26909 into eclair 
Merge commit '9f9a0ad5744a934a521578511b59566d05ed1784'

* commit '9f9a0ad5744a934a521578511b59566d05ed1784':
  Not all WebView's host have permission to read the history.
 2009-09-25 11:11:16 -07:00
Dmitri Plotnikov
affabd66e0 am 7f8d14e8: am 6938bb36: Fixing the broken build 
Merge commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9'

* commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9':
  Fixing the broken build
 2009-09-25 11:10:38 -07:00
Cary Clark
abb34549b2 am f28ffd06: am f18c5393: set the selection after sending a click 
Merge commit 'f28ffd0688d83c019e74a7d32759d5734396baa4'

* commit 'f28ffd0688d83c019e74a7d32759d5734396baa4':
  set the selection after sending a click
 2009-09-25 11:10:08 -07:00
Dmitri Plotnikov
cde981dbac am 2841a1c1: am f22fc124: Adding timestamp and account to contact-level presence columns. 
Merge commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08'

* commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08':
  Adding timestamp and account to contact-level presence columns.
 2009-09-25 11:09:57 -07:00
Daisuke Miyakawa
68bb98fb9f am cc2465bb: am f2bed60b: Add final to appropriate variables. 
Merge commit 'cc2465bbd5845fb128963f845589c8a6e41c64de'

* commit 'cc2465bbd5845fb128963f845589c8a6e41c64de':
  Add final to appropriate variables.
 2009-09-25 11:09:51 -07:00
Daisuke Miyakawa
9bb967ef49 am 577d32a5: am b55e60e1: Fix vCard code. 
Merge commit '577d32a57d1b21b40015ac202147e00e8243db63'

* commit '577d32a57d1b21b40015ac202147e00e8243db63':
  Fix vCard code.
 2009-09-25 11:09:40 -07:00
Grace Kloba
069e2dda63 am 0eb9ac8f: am 43f99202: Merge change 26896 into eclair 
Merge commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2'

* commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2':
  ResultTransport needs a default value. If the thread is
 2009-09-25 11:09:27 -07:00
Satish Roddom
0bcd7ef6cc am 3f5db261: am 03d2009b: Merge change 26895 into eclair 
Merge commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d'

* commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d':
  Subject issue in MMS message
 2009-09-25 11:09:03 -07:00
Lixin Yue
bbdd9f9d9d am 2c01a82f: am bfe1297b: Merge change 26869 into eclair 
Merge commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2'

* commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2':
  Add call log support to pim.vcard.VCardComposer
 2009-09-25 11:08:34 -07:00