Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,869 Commits 3 Branches 0 Tags
c7b29fbb3ea4601e8bfcf8d2ce13c3fbb390de82
Commit Graph

10242 Commits

Author SHA1 Message Date
Adam Powell
c7b29fbb3e Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture" 2010-09-12 14:19:46 -07:00
Adam Powell
0a8bf86413 Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture 
Change-Id: I171ccad91ddc7e7983664dbf52d3104508493538
 2010-09-12 14:17:46 -07:00
Romain Guy
e4e0a4bca0 am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap" 
Merge commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8'

* commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
  fix typo in comment @beamsOverlap
 2010-09-12 14:01:08 -07:00
Brad Fitzpatrick
42a5ed2015 resolved conflicts for merge of 171c83f4 to master 
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
 2010-09-12 13:55:18 -07:00
Adam Powell
806b717bf5 Merge "resolved conflicts for merge of 12e08f3a to master" 2010-09-12 13:14:16 -07:00
Adam Powell
be36668499 resolved conflicts for merge of 12e08f3a to master 
Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
 2010-09-12 12:47:04 -07:00
Romain Guy
ae44d554b7 Merge "Correct implementation of saveLayer()." 2010-09-12 12:25:13 -07:00
Romain Guy
f607bdc167 Correct implementation of saveLayer(). 
Change-Id: I5375126636913e0a84f2d6bbd0ebe40d2e4f2763
 2010-09-12 12:24:12 -07:00
Romain Guy
7d5c0e660e am 15f0a79a: Merge "fix typo in comment @beamsOverlap" 
Merge commit '15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp

* commit '15f0a79a81fd18211603587bcd46eee0e37ced4d':
  fix typo in comment @beamsOverlap
 2010-09-12 12:01:54 -07:00
Romain Guy
15f0a79a81 Merge "fix typo in comment @beamsOverlap" 2010-09-12 11:42:49 -07:00
Brad Fitzpatrick
171c83f47d am 11fe181e: Add faster TextUtil function for searching delimited lists. 
Merge commit '11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp

* commit '11fe181e16501103d7c0f70344661ea2ef5d3df9':
  Add faster TextUtil function for searching delimited lists.
 2010-09-12 11:03:48 -07:00
Brad Fitzpatrick
11fe181e16 Add faster TextUtil function for searching delimited lists. 
The previous version in Settings allocated memory.

Change-Id: I0f821112dc8f830689489f201ce268195f9e6cbd
 2010-09-12 10:58:38 -07:00
Adam Powell
12e08f3a88 am 26cab064: Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread 
Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp

* commit '26cab06472badee374ac854f5a210991c37c4493':
  Allow two finger pan and scale on touchscreens with
 2010-09-12 10:28:50 -07:00
Adam Powell
26cab06472 Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread 2010-09-12 10:25:55 -07:00
madan ankapura
44e8ec7197 fix typo in comment @beamsOverlap 
Change-Id: I7c7f8e94391ed71a54b65badea164286281df7e3
 2010-09-12 09:09:05 -07:00
Romain Guy
01937f63dc Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Chet Haase
5976d24d6f Merge "Make fragment animations work when fragments go away" 2010-09-10 17:45:03 -07:00
Chet Haase
b20db3ec34 Make fragment animations work when fragments go away 
Change-Id: I136de6ef910cc02b8181fcfa065bdb0770841396
 2010-09-10 17:43:04 -07:00
Winson Chung
28d8fda9d8 Merge "-> Fixing some layout issues in StackView -> Made the highlight width depend on the screen density" 2010-09-10 17:25:44 -07:00
Jean-Baptiste Queru
f0257c5973 am b387571c: am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'b387571c42aa08b5b9aa9833edb94c16a623e535'

* commit 'b387571c42aa08b5b9aa9833edb94c16a623e535':
  Fix number counter will keep going after window losed focus.
 2010-09-10 17:24:34 -07:00
Jean-Baptiste Queru
b387571c42 am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp

* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
  Fix number counter will keep going after window losed focus.
 2010-09-10 16:39:35 -07:00
Jean-Baptiste Queru
8485fedfeb am d77b0dfd: am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855'

* commit 'd77b0dfdf364ed2fabd9d7a2b26d54e34fce0855':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 16:22:27 -07:00
Jean-Baptiste Queru
ca6de93a9d Merge "Fix number counter will keep going after window losed focus." 2010-09-10 16:13:13 -07:00
Adam Cohen
dfcdddd7c4 -> Fixing some layout issues in StackView 
-> Made the highlight width depend on the screen density

Change-Id: I6b3ae68de5fb90728938a7e0869cf97e816aa6af
 2010-09-10 16:11:40 -07:00
Amith Yamasani
733cbd58cb SearchView API 
Implements the basic requirements for in-app search. More work to be done.
 2010-09-10 16:00:12 -07:00
Jean-Baptiste Queru
d77b0dfdf3 am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp

* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 15:47:27 -07:00
Brad Fitzpatrick
0b29554188 am 37fc8cc7: am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 
Merge commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd'

* commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd':
  Enable strictmode logging in system_server & add a lock.
 2010-09-10 15:07:20 -07:00
Vasu Nori
196663234a remove unnecessary synchronization object from SQLiteClosable. 
and a couple of other minor SMP fixes

Change-Id: I62bb4dd2fe43fc41074454a25bd84ad1fb4d004d
 2010-09-10 14:27:06 -07:00
Jean-Baptiste Queru
7c65585feb Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 2010-09-10 14:25:14 -07:00
Brad Fitzpatrick
37fc8cc7b8 am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 
Merge commit 'b724d2519a900744a477bd57df6a2f8703c87e72' into gingerbread-plus-aosp

* commit 'b724d2519a900744a477bd57df6a2f8703c87e72':
  Enable strictmode logging in system_server & add a lock.
 2010-09-10 14:08:58 -07:00
Brad Fitzpatrick
b724d2519a Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 2010-09-10 14:05:57 -07:00
Vasu Nori
bcd3387eed Merge "Return count of rows in a resultset only once (when startPos = 0)" 2010-09-10 13:45:45 -07:00
Vasu Nori
b18f27dbf4 Return count of rows in a resultset only once (when startPos = 0) 
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
 2010-09-10 13:43:19 -07:00
Joe Onorato
201480c50e Fix the last remaining @deprecated tag without comment warning. 
Change-Id: I526707233652e8092b33357d08f8ed81cd3a9e14
 2010-09-10 15:55:43 -04:00
Joe Onorato
fb71733b35 am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp

* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
  Fix the last remaining @deprecated tag without comment warning.
 2010-09-10 12:46:52 -07:00
Joe Onorato
4d8cc7bdf4 Fix the last remaining @deprecated tag without comment warning. 
Change-Id: Id4c50dee743fa781ca3f470f97ed76d1501f7222
 2010-09-10 15:01:35 -04:00
Leon Scroggins
200c13d37f Do not put the selection on screen for non password fields. 
Instead, allow webkit to do it.

Requires a change to external/webkit.

Bug 2679411
Bug 2659028

Change-Id: Ibe5dfc90b13d13f7575649e4c90d5166de10dbb2
 2010-09-10 13:09:01 -04:00
Shimeng (Simon) Wang
610d92f4c9 Merge "Use the default scale for text input." 2010-09-10 09:39:34 -07:00
Brad Fitzpatrick
1e02d36b0f Enable strictmode logging in system_server & add a lock. 
We weren't logging strictmode violation in the system_server process
in non-user builds (only system apps), even though the rest of the
strictmode logging supports it.

Also add a missing lock in ActivityManagerService.

Change-Id: If2af96a7e4fdde604a647b836097f0029ef1334b
 2010-09-10 09:19:50 -07:00
Dianne Hackborn
f22c30cd81 am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'

* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
  Fix doc of fullScreenIntent.
 2010-09-09 21:39:22 -07:00
Dianne Hackborn
c6ded1ba46 am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c'

* commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c':
  Small fixes to battery stats.
 2010-09-09 21:39:13 -07:00
Dianne Hackborn
033b381b4c am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp

* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
  Fix doc of fullScreenIntent.
 2010-09-09 21:34:38 -07:00
Dianne Hackborn
195dc210cb am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
 2010-09-09 21:34:33 -07:00
Dianne Hackborn
7f07f842c9 Merge "Fix doc of fullScreenIntent." into gingerbread 2010-09-09 21:31:08 -07:00
Dianne Hackborn
a4ce31f5e0 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00
Adam Cohen
1a28bbb99d Merge "Fixing a bug where StackView wasn't always laid out correctly upon loading" 2010-09-09 18:48:09 -07:00
Adam Cohen
f04e22571f Fixing a bug where StackView wasn't always laid out 
correctly upon loading

Change-Id: Iab80262be05dae949998a6193856fb7bbe297117
 2010-09-09 18:42:13 -07:00
Winson Chung
2f803bea32 Merge "Adding some error handling to RemoteViewsAdapter, removing artificial loading delay." 2010-09-09 17:53:36 -07:00
Winson Chung
fbc3590f40 Adding some error handling to RemoteViewsAdapter, removing artificial loading delay. 
Change-Id: I9cff6045086f0959ace65c2210fa3b9341f5aa5e
 2010-09-09 16:45:38 -07:00
Dianne Hackborn
b8071d790a Small fixes to battery stats. 
Change-Id: Ibbf7c548a8e787a046de3659094cea64908e3deb
 2010-09-09 16:45:15 -07:00