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

4189 Commits

Author SHA1 Message Date
Grace Kloba
e10598ad2f am 1ff3d1f0: am e03848eb: Merge change 27154 into eclair 
Merge commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055'

* commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055':
  When change from narrow screen to wide screen, we will
 2009-09-28 01:12:06 -07:00
Christopher Tate
cfe771500a am 2d5168f6: am 141e4f1d: Merge change 27177 into eclair 
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'

* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
  Add auto-brightness mode to the list of backed-up settings
 2009-09-28 01:10:40 -07:00
Dmitri Plotnikov
d14db943d3 am 2a2e6ba8: am 8e55eacc: Changing contact status to Presence-based 
Merge commit '2a2e6ba829e9cb4f27ce40991f9a99090d08ec9e'

* commit '2a2e6ba829e9cb4f27ce40991f9a99090d08ec9e':
  Changing contact status to Presence-based
 2009-09-28 01:10:26 -07:00
Mike Cleron
88146ee5af am 5cf07feb: am db9c3f2e: Merge change 27188 into eclair 
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e'

* commit '5cf07feb3df89e827324e1204674c4f3629eb27e':
  Fix 2146581: Make tabs work for donut apps
 2009-09-28 01:10:15 -07:00
Dianne Hackborn
c94126bc99 am 25ff4e8c: am 23976407: Maybe fix issue #2145012: Array bounds exception in touch event processing 
Merge commit '25ff4e8c8111fabf79a922073ccf2873520d03cd'

* commit '25ff4e8c8111fabf79a922073ccf2873520d03cd':
  Maybe fix issue #2145012: Array bounds exception in touch event processing
 2009-09-28 01:09:41 -07:00
Dianne Hackborn
b8949398b2 am bc21ba24: am 093f5810: Merge change 27238 into eclair 
Merge commit 'bc21ba2410233b40b21a190b26285a791ac5cc58'

* commit 'bc21ba2410233b40b21a190b26285a791ac5cc58':
  The touch screen is probably a feature.
 2009-09-28 01:09:32 -07:00
Evan Millar
60f203472f am c321ab99: am 3579c4c6: Merge change 27234 into eclair 
Merge commit 'c321ab992d526cde098986d512ce4a051c486607'

* commit 'c321ab992d526cde098986d512ce4a051c486607':
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
 2009-09-28 01:09:10 -07:00
Tadashi G. Takaoka
07783cda29 am 0198a9ce: am f06e9984: Merge change 26993 into eclair 
Merge commit '0198a9ce3a66ba8b64f797044b718e7b48e46bcb'

* commit '0198a9ce3a66ba8b64f797044b718e7b48e46bcb':
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-28 01:08:54 -07:00
Evan Millar
35bfb226aa am 8290ab75: am b27a1166: Merge change 27233 into eclair 
Merge commit '8290ab75330d055584351005137d1a61c6a3b345'

* commit '8290ab75330d055584351005137d1a61c6a3b345':
  Change longClick -> click in ContactHeaderWidget.
 2009-09-28 01:08:37 -07:00
Jeff Sharkey
b18e90cd46 am 67e40117: am 05701839: Remove query parameters for delaying group updates. 
Merge commit '67e40117f7f79163469a7702de50c0123bf677d2'

* commit '67e40117f7f79163469a7702de50c0123bf677d2':
  Remove query parameters for delaying group updates.
 2009-09-28 01:07:33 -07:00
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
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
Grace Kloba
1ff3d1f0a2 am e03848eb: Merge change 27154 into eclair 
Merge commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2' into eclair-plus-aosp

* commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2':
  When change from narrow screen to wide screen, we will
 2009-09-27 12:32:47 -07:00
Android (Google) Code Review
e03848eb93 Merge change 27154 into eclair 
* changes:
  When change from narrow screen to wide screen, we will leave the mMinZoomScale to 1.0
 2009-09-27 15:24:48 -04:00
Christopher Tate
2d5168f650 am 141e4f1d: Merge change 27177 into eclair 
Merge commit '141e4f1d69186104c3e169ee7365b62bc425859a' into eclair-plus-aosp

* commit '141e4f1d69186104c3e169ee7365b62bc425859a':
  Add auto-brightness mode to the list of backed-up settings
 2009-09-27 10:26:39 -07:00
Android (Google) Code Review
141e4f1d69 Merge change 27177 into eclair 
* changes:
  Add auto-brightness mode to the list of backed-up settings
 2009-09-27 13:20:44 -04:00
Dmitri Plotnikov
2a2e6ba829 am 8e55eacc: Changing contact status to Presence-based 
Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp

* commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31':
  Changing contact status to Presence-based
 2009-09-27 08:34:10 -07:00
Dmitri Plotnikov
8e55eaccff Changing contact status to Presence-based 
Change-Id: I35589e87f1e1743413d3f10509e9eccc333aa2fb
 2009-09-27 08:23:58 -07:00
Mike Cleron
5cf07feb3d am db9c3f2e: Merge change 27188 into eclair 
Merge commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735' into eclair-plus-aosp

* commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735':
  Fix 2146581: Make tabs work for donut apps
 2009-09-27 00:36:15 -07:00
Android (Google) Code Review
db9c3f2e9a Merge change 27188 into eclair 
* changes:
  Fix 2146581: Make tabs work for donut apps Use different tab assets with the original coloring scheme for apps that are not Eclair-aware.
 2009-09-27 03:31:59 -04:00
Dianne Hackborn
25ff4e8c81 am 23976407: Maybe fix issue #2145012: Array bounds exception in touch event processing 
Merge commit '2397640740e053af7ef4aa742467f723186d5ad7' into eclair-plus-aosp

* commit '2397640740e053af7ef4aa742467f723186d5ad7':
  Maybe fix issue #2145012: Array bounds exception in touch event processing
 2009-09-26 17:52:29 -07:00
Dianne Hackborn
2397640740 Maybe fix issue #2145012: Array bounds exception in touch event processing 
Change-Id: I223d9ae29f22f08cb8426ccd8bbadeedd5db3fc3
 2009-09-26 17:34:50 -07:00
Dianne Hackborn
bc21ba2410 am 093f5810: Merge change 27238 into eclair 
Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp

* commit '093f581090d8cf98f5877746d924107f7695dd8b':
  The touch screen is probably a feature.
 2009-09-26 17:06:41 -07:00
Android (Google) Code Review
093f581090 Merge change 27238 into eclair 
* changes:
  The touch screen is probably a feature.
 2009-09-26 20:00:07 -04:00
Dianne Hackborn
039c68e756 The touch screen is probably a feature. 
Also extend the feature APIs a bit.

Change-Id: I99e932d7f4e61edb0e20f75c55e9831e4b59a14d
 2009-09-26 16:39:23 -07:00
Evan Millar
c321ab992d am 3579c4c6: Merge change 27234 into eclair 
Merge commit '3579c4c6729dd8aa077550531a8337bf0664b23d' into eclair-plus-aosp

* commit '3579c4c6729dd8aa077550531a8337bf0664b23d':
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
 2009-09-26 14:54:47 -07:00
Android (Google) Code Review
3579c4c672 Merge change 27234 into eclair 
* changes:
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
 2009-09-26 17:49:12 -04:00
Evan Millar
695800047c Fix http://b/issue?id=2106682 (Don't show status if we don't have it). 
Change-Id: I1636914ef47fc5319f2593d3e7aea33e523be3c7
 2009-09-26 14:47:38 -07:00
Tadashi G. Takaoka
0198a9ce3a am f06e9984: Merge change 26993 into eclair 
Merge commit 'f06e9984e833907057065946cf68ff95d6af1ead' into eclair-plus-aosp

* commit 'f06e9984e833907057065946cf68ff95d6af1ead':
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-26 14:13:08 -07:00
Android (Google) Code Review
f06e9984e8 Merge change 26993 into eclair 
* changes:
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-26 17:06:47 -04:00
Evan Millar
8290ab7533 am b27a1166: Merge change 27233 into eclair 
Merge commit 'b27a1166d538afaf2be480cc0101645ea7b3964f' into eclair-plus-aosp

* commit 'b27a1166d538afaf2be480cc0101645ea7b3964f':
  Change longClick -> click in ContactHeaderWidget.
 2009-09-26 13:40:11 -07:00
Evan Millar
bf07e03291 Change longClick -> click in ContactHeaderWidget. 
Also don't enable it by default, but add an api to explicitly request
it.

Change-Id: I75fa4bfddba7a1800dec24e6a068eca614370a26
 2009-09-26 13:30:01 -07:00
Jeff Sharkey
67e40117f7 am 05701839: Remove query parameters for delaying group updates. 
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp

* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
  Remove query parameters for delaying group updates.
 2009-09-26 05:35:15 -07:00
Jeff Sharkey
057018399c Remove query parameters for delaying group updates. 
Callers should instead use applyBatch(), which now delays
any visible updates until the transation finishes.  This
partially fixes http://b/2075275
 2009-09-26 02:14:43 -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
Mike Cleron
7609764295 Fix 2146581: Make tabs work for donut apps 
Use different tab assets with the original coloring scheme
for apps that are not Eclair-aware.
 2009-09-25 17:53:56 -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
Christopher Tate
362aca6045 Add auto-brightness mode to the list of backed-up settings 
Change-Id: I4302b79691ed717d810748b239311cba198f6381
 2009-09-25 17:14:57 -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