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

4685 Commits

Author SHA1 Message Date
Nick Pelly
528961a61d am 94bbfa47: Merge change 27142 into eclair 
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp

* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
  Handle expiration of discovery mode in system server.
 2009-09-27 12:47:32 -07:00
Nick Pelly
3ecb11e099 am 65dea14c: Merge change 27129 into eclair 
Merge commit '65dea14cafb357411c6f9307c6d9add60822aa33' into eclair-plus-aosp

* commit '65dea14cafb357411c6f9307c6d9add60822aa33':
  Bounds check read and write path in native code.
 2009-09-27 12:47:27 -07:00
Android (Google) Code Review
e7d60bfdff Merge change 27032 into eclair 
* changes:
  BatteryService: Specify low battery levels in resources.
 2009-09-27 15:43:17 -04:00
Android (Google) Code Review
94bbfa47b0 Merge change 27142 into eclair 
* changes:
  Handle expiration of discovery mode in system server.
 2009-09-27 15:42:14 -04:00
Mike Lockwood
d81b1f41e5 BatteryService: Specify low battery levels in resources. 
Also trigger low battery when battery reaches the specified level
rather than when it drops below the level.

Fixes bug b/1788656

Change-Id: I81f5cbb9892fc6574320d92e153211f83c69f415
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-09-27 15:42:07 -04:00
Android (Google) Code Review
65dea14caf Merge change 27129 into eclair 
* changes:
  Bounds check read and write path in native code.
 2009-09-27 15:41:51 -04: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
Mike Cleron
6a1f439903 am 954e98e0: Merge change 27267 into eclair 
Merge commit '954e98e023568b354aeec0a54668155ad9083398' into eclair-plus-aosp

* commit '954e98e023568b354aeec0a54668155ad9083398':
  Add official assets for tabs in compatibility mode
 2009-09-27 11:12:55 -07:00
Android (Google) Code Review
954e98e023 Merge change 27267 into eclair 
* changes:
  Add official assets for tabs in compatibility mode
 2009-09-27 14:05:05 -04:00
Mike Cleron
68d9254d59 Add official assets for tabs in compatibility mode 2009-09-27 11:00:14 -07: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
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
Grace Kloba
ba6728023d When change from narrow screen to wide screen, we will 
leave the mMinZoomScale to 1.0
 2009-09-25 15:54:08 -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