Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,316 Commits 3 Branches 0 Tags
03e47fc87cd17a3d430da45bdffccd37b4e83b26
Commit Graph

11223 Commits

Author SHA1 Message Date
Grace Kloba
fcc08fb8ed am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo 
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken

* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
  Update the comment which supposed to be checked in
 2010-04-19 16:19:30 -07:00
Grace Kloba
8831d4dc55 am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo 
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp

* commit '8f655cb6c836380778545fb13044d97ef57139d6':
  Update the comment which supposed to be checked in
 2010-04-19 16:15:41 -07:00
Grace Kloba
8f655cb6c8 Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:11:21 -07:00
Grace Kloba
f706ef857b Update the comment which supposed to be checked in 
in the last CL.

Fix http://b/issue?id=2607352
 2010-04-19 16:05:19 -07:00
Adam Powell
b19b17ed39 am 8dc38941: am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:49:44 -07:00
Adam Powell
8dc38941b4 am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 
Merge commit '7f30f8abe3161ae912c3475aa89ad14388f576d7' into kraken

* commit '7f30f8abe3161ae912c3475aa89ad14388f576d7':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
 2010-04-19 15:41:05 -07:00
Adam Powell
7f30f8abe3 am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 
Merge commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp

* commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
 2010-04-19 15:38:11 -07:00
Adam Powell
93d35f7743 Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:33:08 -07:00
Adam Powell
8568c3a09b Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible. 
Change-Id: I7eb38c53c3a03b23786b8b0c2d16139acd0eb38e
 2010-04-19 15:26:15 -07:00
Dianne Hackborn
2dedce6e84 Introducing Fragment. 
Basic implementation of an API for organizing a single activity into separate,
discrete pieces.  Currently supports adding and removing fragments, and
performing basic lifecycle callbacks on them.

Change-Id: I6ea8e6bdb04d93f8105c2e983fe9b6532422de34
 2010-04-19 15:09:31 -07:00
Daniel Lehmann
4fcc5b1f93 Ensure public methods exist to update the state of the UI, so that it can be set from outside 
Change-Id: Ib1d7b0b36b6cdcbf1256647da76130927a29ec6d
 2010-04-19 13:41:07 -07:00
Grace Kloba
53be241f73 am 4a77f9e9: am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:27:44 -07:00
Grace Kloba
4a77f9e9a2 am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken

* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
  Remove fixed size restriction on the SurfaceView
 2010-04-19 13:21:58 -07:00
Grace Kloba
e3ce4c89cc am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp

* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
  Remove fixed size restriction on the SurfaceView
 2010-04-19 13:17:53 -07:00
Grace Kloba
2dc784988a Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:14:21 -07:00
Grace Kloba
4ead13caa3 am e5afb10c: am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 2010-04-19 12:35:57 -07:00
Grace Kloba
e5afb10cca am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken

* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
  Force redraw in touch_up if there is a move.
 2010-04-19 12:23:54 -07:00
Grace Kloba
66fa5cc73d am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp

* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
  Force redraw in touch_up if there is a move.
 2010-04-19 12:18:22 -07:00
Grace Kloba
6edb3792d8 Remove fixed size restriction on the SurfaceView 
before setting it to the full screen content view.

Fix http://b/issue?id=2607352
 2010-04-19 12:14:17 -07:00
Dianne Hackborn
c96a7b2810 Merge "2604184 Expose hidden APIs for testing the AccessibilityManager separately from the backing AccessibilityManagerServcie" 2010-04-19 12:06:37 -07:00
Grace Kloba
c36862d53a Force redraw in touch_up if there is a move. 
Fix http://b/issue?id=2606815
 2010-04-19 10:16:42 -07:00
Daisuke Miyakawa
931a0a9432 Refactor vCard so that it correctly choose charset while importing 
some files.

Change-Id: I27600e260cd7ca42a25481d5ff61f262c9328d61
 2010-04-19 18:52:08 +09:00
Svetoslav Ganov
af7adab3e3 2604184 Expose hidden APIs for testing the AccessibilityManager separately from the backing AccessibilityManagerServcie 
Change-Id: Ief5df31baa3c0990467625977e97cd066a671959
 2010-04-16 18:19:33 -07:00
Grace Kloba
5a2e428ce8 am eb94c44c: am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 17:22:51 -07:00
Grace Kloba
eb94c44c0f am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken

* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
  Missed a case to resumeUpdatePicture.
 2010-04-16 16:40:54 -07:00
Grace Kloba
17e36d233d am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 
Merge commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp

* commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
  Missed a case to resumeUpdatePicture.
 2010-04-16 16:38:25 -07:00
Grace Kloba
3c44db3f67 Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 16:34:43 -07:00
Vasu Nori
20f549fd2f several minor bugs and things listed below 
bug:1648729
   print warning if a requery is attemped on main thread
bug:2459293
   browser death because of NoSuchElementException. don't use iterator
   to march thru the ArrayList. use old style for() loop.
bug:1609474
   don't allow downgrades of databases
other stuff
   use LRUcache to maintain statement-cache in SQLiteDatabase
Change-Id: I3a42022162f4dfcc75f7d0cfcad8f20f1d193249
 2010-04-16 15:50:41 -07:00
Grace Kloba
aa373c9868 Missed a case to resumeUpdatePicture. 
Fix http://b/issue?id=2603882
 2010-04-16 15:49:36 -07:00
Vasu Nori
3bf1e8220a am 99d43435: am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 15:04:16 -07:00
Vasu Nori
99d43435b6 am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 
Merge commit '66bee81321f16a3268adc43f5f87fcfbf8c27290' into kraken

* commit '66bee81321f16a3268adc43f5f87fcfbf8c27290':
  accept close() on database objects even if the database is closed
 2010-04-16 14:57:26 -07:00
Vasu Nori
66bee81321 am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 
Merge commit '1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp

* commit '1fc46c623f9af8aaccfd519ece78331d9a95e579':
  accept close() on database objects even if the database is closed
 2010-04-16 14:53:32 -07:00
Vasu Nori
0dbb9cee58 accept close() on database objects even if the database is closed 
bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
 2010-04-16 14:24:57 -07:00
Mike Reed
6758a1dd6b am 3edf3a56: am e0a40686: am f066611a: retool resize logic to use max dimension and max area. 2010-04-16 12:35:26 -07:00
Mike Reed
3edf3a567e am e0a40686: am f066611a: retool resize logic to use max dimension and max area. 
Merge commit 'e0a4068640cff64abcd3a70395ad461919b15ea6' into kraken

* commit 'e0a4068640cff64abcd3a70395ad461919b15ea6':
  retool resize logic to use max dimension and max area.
 2010-04-16 12:26:52 -07:00
Mike Reed
e0a4068640 am f066611a: retool resize logic to use max dimension and max area. 
Merge commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp

* commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a':
  retool resize logic to use max dimension and max area.
 2010-04-16 12:24:09 -07:00
Mike Reed
f066611aab retool resize logic to use max dimension and max area. 
Change-Id: I32446b41afe9e7c241868c0cb7b9b7d9056b2d38
http://b/issue?id=2598253
 2010-04-16 15:19:02 -04:00
Mike LeBeau
3c43c5cfb2 am 5fee638e: am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 2010-04-16 07:36:13 -07:00
Mike LeBeau
5fee638e4b am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 
Merge commit 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken

* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
  For search suggestions in the search dialog, allow the 'title'
 2010-04-16 07:30:18 -07:00
Mike LeBeau
f04be52a38 am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
 2010-04-16 07:27:34 -07:00
Mike LeBeau
0c5ad4f1b3 Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Leon Scroggins III
ae9f8e4abd Request focus when MotionEvent.ACTION_UP is received. 
Bug 2585857

Change-Id: I2e852d2225db4d1ba48815354a31e0823e4d3a8d
 2010-04-16 09:23:08 -04:00
Daisuke Miyakawa
186bad00b4 Refactor vCard code. 
- make the usage of VCardSourceDetector.
- simplyfy flag usage.
- remove unnecessary argument "canceled"

Change-Id: I6dd9723df7230be7478f6817c0ac2e6cbedc6ca7
 2010-04-16 11:38:48 +09:00
android-build SharedAccount
120c457672 manual merge 
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
 2010-04-15 16:36:34 -07:00
Shimeng (Simon) Wang
62d8a0f8a9 Merge "Convert obsolete language codes to new standards in Accept-Language and User-Agent." 2010-04-15 14:36:28 -07:00
Shimeng (Simon) Wang
0e4cb9d89f Convert obsolete language codes to new standards in Accept-Language and User-Agent. 
Bug:2593415
Change-Id: I6b0bd161a0a2222da6ab7812614c1ba03d8c22eb
 2010-04-15 14:25:49 -07:00
Dianne Hackborn
e02ffa34a8 am 292bdbd9: am e3094117: Merge "A little more improvement of the Service javadoc." into froyo 
Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken

* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
  A little more improvement of the Service javadoc.
 2010-04-15 13:39:16 -07:00
Robert Greenwalt
007302adeb am d65d5f11: am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo 
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken

* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
  Fix SntpClient to give accurate time info.
 2010-04-15 13:37:31 -07:00
Dianne Hackborn
292bdbd9c4 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo 
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp

* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
  A little more improvement of the Service javadoc.
 2010-04-15 13:36:44 -07:00
Dianne Hackborn
e3094117a0 Merge "A little more improvement of the Service javadoc." into froyo 2010-04-15 13:33:21 -07:00