Commit Graph

14095 Commits

Author SHA1 Message Date
Martijn Coenen
173c98fdcf am 89bc2378: am 261fa998: am 25be5365: Implement canMakeReadonly().
* commit '89bc23783f2350c834623993835dac32d0862759':
  Implement canMakeReadonly().
2011-01-12 15:35:20 -08:00
Nick Pelly
1ba6125396 am 167ac435: am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '167ac4355948e777b4680d86365fea78b24cdb8f':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:35:13 -08:00
Huahui Wu
54e80b7958 am f6a63f95: am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
* commit 'f6a63f95a85a9fb7b2150e437cacc7db66451574':
  b/3344966 pan following the focus point instead the first point.
2011-01-12 15:32:52 -08:00
Martijn Coenen
89bc23783f am 261fa998: am 25be5365: Implement canMakeReadonly().
* commit '261fa99890ebd1ea15a6067859b0e931a3009859':
  Implement canMakeReadonly().
2011-01-12 15:31:07 -08:00
Nick Pelly
167ac43559 am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '6b9db1d8c808439abc12d572283b7fab50fb5257':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:30:53 -08:00
Huahui Wu
f6a63f95a8 am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
  b/3344966 pan following the focus point instead the first point.
2011-01-12 15:30:14 -08:00
Huahui Wu
5587305109 Merge "b/3344966 pan following the focus point instead the first point." into honeycomb 2011-01-12 15:27:16 -08:00
Brad Fitzpatrick
2f71565aac am ef5864f1: am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
* commit 'ef5864f1bb1418307c40fc8ed4cae7545d8a44dd':
  Unhide Content{Resolver,Provider}.call()
2011-01-12 15:07:34 -08:00
Brad Fitzpatrick
ef5864f1bb am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
* commit '2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
  Unhide Content{Resolver,Provider}.call()
2011-01-12 15:03:15 -08:00
Brad Fitzpatrick
2e3908097b Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb 2011-01-12 14:39:50 -08:00
Huahui Wu
f147d456a5 b/3344966 pan following the focus point instead the first point.
Change-Id: Iaed482c7c4e8a616cbabf8c5af706b8160c880b1
2011-01-12 14:38:30 -08:00
Romain Guy
0880af5983 am 1138401f: am e465b117: Merge "Better debug info for layers." into honeycomb
* commit '1138401f348b2e30dc48c01da9a26e66e51b318c':
  Better debug info for layers.
2011-01-12 14:19:51 -08:00
Brad Fitzpatrick
534c84c1ce Unhide Content{Resolver,Provider}.call()
Change-Id: Ic7833b921f5a8e70ef7d565bfdf461e6e135ff1b
2011-01-12 14:19:19 -08:00
Romain Guy
1138401f34 am e465b117: Merge "Better debug info for layers." into honeycomb
* commit 'e465b11745cdc49283c360fb2acf01649f4f4fb0':
  Better debug info for layers.
2011-01-12 14:17:59 -08:00
Romain Guy
e465b11745 Merge "Better debug info for layers." into honeycomb 2011-01-12 14:15:59 -08:00
Romain Guy
3aaff3aef4 Better debug info for layers.
Change-Id: I816c2446a33a1135553eaeea2f89c7418641cfe1
2011-01-12 14:18:47 -08:00
Gilles Debunne
51f9ecdde0 am ee3aadbc: am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb
* commit 'ee3aadbc95a7b337bfef4ba5058c2605b10da357':
  New QuickContactBadge holo style.
2011-01-12 14:11:31 -08:00
Gilles Debunne
ee3aadbc95 am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb
* commit '54c38bf05da42e40b8726ab2b5a33762081e9345':
  New QuickContactBadge holo style.
2011-01-12 14:09:42 -08:00
Gilles Debunne
54c38bf05d Merge "New QuickContactBadge holo style." into honeycomb 2011-01-12 14:07:26 -08:00
Dianne Hackborn
e4ec625547 am 45a1ada5: am 02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb
* commit '45a1ada57059e012c6d0cf216cafd852dd1b42ed':
  Make ProgressDialog a little less lame.
2011-01-12 13:03:29 -08:00
Dianne Hackborn
45a1ada570 am 02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb
* commit '02e852f968bac83947cd97a5fe7c7a7064774c5a':
  Make ProgressDialog a little less lame.
2011-01-12 13:01:42 -08:00
Dianne Hackborn
02e852f968 Merge "Make ProgressDialog a little less lame." into honeycomb 2011-01-12 12:59:27 -08:00
Romain Guy
b69e249af8 am 5ecceb7d: am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
* commit '5ecceb7df70a6e6b2a32ab97630bc625000261da':
  Cleanup GL objects on the correct thread.
2011-01-12 12:54:28 -08:00
Romain Guy
5ecceb7df7 am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
* commit '853548287ffe4eb85d1bd10669270292336d137a':
  Cleanup GL objects on the correct thread.
2011-01-12 12:52:41 -08:00
Romain Guy
853548287f Merge "Cleanup GL objects on the correct thread." into honeycomb 2011-01-12 12:50:50 -08:00
Romain Guy
57066eb64c Cleanup GL objects on the correct thread.
Change-Id: Iddfea6e08a6591a4fab147151098ef27005f373d
2011-01-12 12:53:32 -08:00
Jaikumar Ganesh
404e1a3ccf am 7347f5e8: am 95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
* commit '7347f5e830b08685f78299d5bcbf6987753dd0ed':
  Add ability to parse keyboard fixed pin auto pair blacklist.
2011-01-12 12:26:50 -08:00
Jaikumar Ganesh
b67d1befcd am 5e2f9db3: am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
* commit '5e2f9db3f15f36ad931213c15837d48c5fdb590f':
  Revert "Add temporary hack for keyboards not following spec."
2011-01-12 12:26:44 -08:00
Jaikumar Ganesh
7347f5e830 am 95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
* commit '95a4751f2111d5d7c03c131e9d9dfad6cc32ceed':
  Add ability to parse keyboard fixed pin auto pair blacklist.
2011-01-12 12:25:01 -08:00
Jaikumar Ganesh
5e2f9db3f1 am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
* commit 'fc019bd4fa3004ec8e287fee0d277db666891ca3':
  Revert "Add temporary hack for keyboards not following spec."
2011-01-12 12:24:57 -08:00
Jaikumar Ganesh
95a4751f21 Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb 2011-01-12 12:22:57 -08:00
Jaikumar Ganesh
fc019bd4fa Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb 2011-01-12 12:22:50 -08:00
Leon Scroggins
919ed610db am 6fcaec50: am 1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
* commit '6fcaec50765424c969c7f9320e68fa6b1d5ed949':
  Differentiate between clicks for focus and actual clicks.
2011-01-12 12:05:16 -08:00
Leon Scroggins
6fcaec5076 am 1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
* commit '1415bb7a948e0add9f6beb6dccbea70e9d2bedd0':
  Differentiate between clicks for focus and actual clicks.
2011-01-12 12:03:24 -08:00
Kenny Root
090093592e am c669559d: am b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
* commit 'c669559dc3c1d348145d902c623166a9d874b5a8':
  Allow updated system apps to retain priority
2011-01-12 12:02:04 -08:00
Leon Scroggins
1415bb7a94 Merge "Differentiate between clicks for focus and actual clicks." into honeycomb 2011-01-12 12:01:31 -08:00
Kenny Root
c669559dc3 am b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
* commit 'b5a4b5d300bc05a969181155a4f155a79241f792':
  Allow updated system apps to retain priority
2011-01-12 12:00:13 -08:00
Kenny Root
502e9a47c6 Allow updated system apps to retain priority
Previously any updated system apps would not be able to have a greater
than 0 priority on an activity intent filter. Moving the priority check
later in the package scanning allows it to apply to updated system
packages as well.

Cherry-pick from gingerbread branch

Bug: 2572398
Change-Id: I95d8b6360bf7a3f39cd7a1ff09e1ee57e11583d8
2011-01-12 11:57:23 -08:00
Jaikumar Ganesh
f487d72215 Add ability to parse keyboard fixed pin auto pair blacklist.
Try auto pairing with such keyboards.
Also fix bug where dynamic auto pairing file was not being created.

Change-Id: I93afb96fee8bc4f245f96ec5961979c620de7948
2011-01-12 11:56:15 -08:00
Kristian Monsen
9810f5099e am 4cfa6447: am 7a8f01ab: Merge "Add a static method to get the InputStream of a content URL" into honeycomb
* commit '4cfa64479f61a74267e57622acd18c6f692b9982':
  Add a static method to get the InputStream of a content URL
2011-01-12 11:42:02 -08:00
Kristian Monsen
0fc96821b0 am 40e086c4: am 6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
* commit '40e086c4226ea05ebf09926a9181735ce28d6d83':
  Adding a static method to get the size of a content url
2011-01-12 11:41:59 -08:00
Dianne Hackborn
4389434c1d Make ProgressDialog a little less lame.
Change-Id: Ic3f1dd8ba32dd02d422ee6f05fff5541e54bb8a1
2011-01-12 11:17:17 -08:00
Kristian Monsen
4cfa64479f am 7a8f01ab: Merge "Add a static method to get the InputStream of a content URL" into honeycomb
* commit '7a8f01abf98b6212358ea0e0401879093d2c0f93':
  Add a static method to get the InputStream of a content URL
2011-01-12 11:17:13 -08:00
Kristian Monsen
40e086c422 am 6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
* commit '6c5e4dc2312f0b6a3c02972c382d5a047793e734':
  Adding a static method to get the size of a content url
2011-01-12 11:17:11 -08:00
Kristian Monsen
7a8f01abf9 Merge "Add a static method to get the InputStream of a content URL" into honeycomb 2011-01-12 11:15:20 -08:00
Kristian Monsen
6c5e4dc231 Merge "Adding a static method to get the size of a content url" into honeycomb 2011-01-12 11:15:09 -08:00
Leon Scroggins
b45a263343 Differentiate between clicks for focus and actual clicks.
Bug:3344162

Requires a change in external/webkit.

Change-Id: I6650a3084926fe4c241ccd7deca146e44460f29c
2011-01-12 14:13:28 -05:00
Huahui Wu
9b93d2c027 am 012acc86: am 342bfbf9: Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
* commit '012acc86200be85d5473763478b6ae87ac502ecb':
  b/3340946 Fix NPE caused by null gesture detector.
2011-01-12 11:01:11 -08:00
Huahui Wu
012acc8620 am 342bfbf9: Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
* commit '342bfbf94fa806be8fefa7ff905ba0a0b0b98df0':
  b/3340946 Fix NPE caused by null gesture detector.
2011-01-12 10:59:22 -08:00
Huahui Wu
342bfbf94f Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb 2011-01-12 10:57:51 -08:00