Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,430 Commits 3 Branches 0 Tags
c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435
Commit Graph

4555 Commits

Author SHA1 Message Date
Dmitri Plotnikov
46ed741331 am a60479d2: Fixing broken javadoc. 
Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp

* commit 'a60479d2ea7857455ebad6c56e357d00b0492364':
  Fixing broken javadoc.
 2009-09-27 20:23:49 -07:00
Dmitri Plotnikov
a60479d2ea Fixing broken javadoc. 
Was linking to a hidden interface.

Change-Id: Iff48cb97ed4078b2b91bade9a47d7afc5d7891bf
 2009-09-27 20:16:37 -07:00
Dmitri Plotnikov
8e8ee1fd72 am 879664e3: Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose. 
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp

* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
  Adding columns to support attribution of status updates.  Also renaming some columns to better describe their purpose.
 2009-09-27 19:55:51 -07:00
Dmitri Plotnikov
879664e3e2 Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose. 
Change-Id: If6d7812f38a3cfd662a5ae2387c72c4761fdf9fa
 2009-09-27 19:47:48 -07:00
Wu-cheng Li
216638a035 am e883847f: Merge change 27292 into eclair 
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp

* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
  Add documentation about flash and change video-light to torch.
 2009-09-27 19:22:12 -07:00
Android (Google) Code Review
e883847f17 Merge change 27292 into eclair 
* changes:
  Add documentation about flash and change video-light to torch.
 2009-09-27 22:13:43 -04:00
Wu-cheng Li
068ef42c3f Add documentation about flash and change video-light to torch. 2009-09-27 17:29:44 -07:00
Dianne Hackborn
10146f239c am 02541fe6: Merge change 27351 into eclair 
Merge commit '02541fe6a256eef2eab37f3aafc1916a46d65c1a' into eclair-plus-aosp

* commit '02541fe6a256eef2eab37f3aafc1916a46d65c1a':
  Allow wallpaper picker to work.
 2009-09-27 17:13:47 -07:00
Android (Google) Code Review
02541fe6a2 Merge change 27351 into eclair 
* changes:
  Allow wallpaper picker to work.
 2009-09-27 20:06:33 -04:00
Dianne Hackborn
aef405d829 Allow wallpaper picker to work. 
Change-Id: I379f25e0e8e372d72c0a89e71ccd584a5dbb3648
 2009-09-27 17:05:46 -07:00
Christopher Tate
f6c74a4f72 am 4b35d699: Merge change 27342 into eclair 
Merge commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0' into eclair-plus-aosp

* commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0':
  Don't back up / restore "allow apps from unknown sources"
 2009-09-27 16:54:54 -07:00
Christopher Tate
f582a69dd2 Don't back up / restore "allow apps from unknown sources" 
We no longer back up the state of the "Allow the installation of applications
from unknown sources" setting, nor do we set that based on restore data even if
it is present.

Change-Id: Ida276874616f1ff82807d642b0b733fcab339529
 2009-09-27 16:36:14 -07:00
Grace Kloba
aecb8a007c am e02e8b9c: Merge change 27315 into eclair 
Merge commit 'e02e8b9c11231d99aacd5fda31042168650edd49' into eclair-plus-aosp

* commit 'e02e8b9c11231d99aacd5fda31042168650edd49':
  Reset mPreventDrag at touch_down.
 2009-09-27 15:09:30 -07:00
Android (Google) Code Review
e02e8b9c11 Merge change 27315 into eclair 
* changes:
  Reset mPreventDrag at touch_down.
 2009-09-27 18:04:13 -04:00
Wei Huang
98b050d067 am fbb72631: add new column "real_date" for IM messages table. 
Merge commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb' into eclair-plus-aosp

* commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb':
  add new column "real_date" for IM messages table.
 2009-09-27 14:55:12 -07:00
Grace Kloba
d66d84ffa2 Reset mPreventDrag at touch_down. 
Check the delta for short press case as we may switch to
PREVENT_DRAG_NO at SWITCH_TO_SHORTPRESS.

This should fix another two corner cases where flick doesn't
do anything.
 2009-09-27 14:53:45 -07:00
Wei Huang
fbb7263121 add new column "real_date" for IM messages table. 
Change-Id: I5c4b3da0843ff0205c2aff5f89639aba47a84e3b
 2009-09-27 14:46:20 -07:00
Wei Huang
7df612ceb9 am 6a07f9fb: Merge change 27301 into eclair 
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp

* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
  bug 2148061: if PduBody is zero length, treat it as an empty message.
 2009-09-27 14:12:56 -07:00
Wei Huang
c6b336d6a4 bug 2148061: if PduBody is zero length, treat it as an empty message. 
Change-Id: I2f352dd481f6b8d02b67cd3a44d692e3a5d03999
 2009-09-27 13:39:46 -07:00
Mike Lockwood
fadc915add am e7d60bfd: Merge change 27032 into eclair 
Merge commit 'e7d60bfdff35ad8eace600d2a6cb81163c966bb0' into eclair-plus-aosp

* commit 'e7d60bfdff35ad8eace600d2a6cb81163c966bb0':
  BatteryService: Specify low battery levels in resources.
 2009-09-27 12:47:37 -07:00
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