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

20763 Commits

Author SHA1 Message Date
Brad Fitzpatrick
5db7fd6b70 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
 2011-03-30 08:21:23 -07:00
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
Eric Fischer
7d5ae75378 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:27:29 -07:00
Eric Fischer
bc2489e4c5 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:20:42 -07:00
Eric Fischer
627e59ad08 Import revised translations. DO NOT MERGE 
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
 2011-03-29 11:58:23 -07:00
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
 2011-03-29 09:27:16 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header. 
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
 2011-03-29 08:54:09 +02:00
Adam Powell
7dfc6a9e32 am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'c8c78eed52148441a4a549a9a19914bbbde6ad17':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:49:11 -07:00
Adam Powell
c8c78eed52 am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:45:06 -07:00
Adam Powell
baa3380d74 Fix bug 4170809 - Pages with flash lose touch events 
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.

Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
 2011-03-25 13:58:19 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID. 
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
 2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID. 
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
 2011-03-24 21:39:58 -05:00
Huahui Wu
772f5bb189 am f440831d: DO NOT MERGE 
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
  DO NOT MERGE
 2011-03-24 03:35:59 -07:00
Teng-Hui Zhu
842b914f26 am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit 'a7605d3b2ec9526fc369e5e0a1a37880db2c0694':
  When the video is not on the front, it should be paused
 2011-03-23 17:36:03 -07:00
Teng-Hui Zhu
a7605d3b2e am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
  When the video is not on the front, it should be paused
 2011-03-23 17:34:15 -07:00
Teng-Hui Zhu
1e26d82ffa When the video is not on the front, it should be paused 
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
 2011-03-23 16:56:12 -07:00
Teng-Hui Zhu
fee1d146a3 am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit '503735099d51e9701be4737dff4e74b35361d371':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:07:57 -07:00
Teng-Hui Zhu
503735099d am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:06:10 -07:00
Teng-Hui Zhu
efb8eda41a Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 2011-03-23 16:03:04 -07:00
Teng-Hui Zhu
2deec6651c Make sure the full screen playing continue when timeout 
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
 2011-03-23 15:29:22 -07:00
Scott Main
8346a6c273 am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error 
* commit 'ee7cfaf28969998ca15800f99bcdab2596051865':
  docs: fix markup error
 2011-03-23 14:47:34 -07:00
Scott Main
ee7cfaf289 am 18cd686f: am ef6b305b: docs: fix markup error 
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
  docs: fix markup error
 2011-03-23 14:43:35 -07:00
Scott Main
18cd686fc8 am ef6b305b: docs: fix markup error 
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
  docs: fix markup error
 2011-03-23 14:32:44 -07:00
Scott Main
ef6b305b93 docs: fix markup error 
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
 2011-03-23 14:23:02 -07:00
repo sync
d5ba9c2223 Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-23 13:46:32 -07:00
Huahui Wu
f440831d76 DO NOT MERGE 
b/4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread

It's a manual cherrypick of
     https://android-git.corp.google.com/g/#change,87278
since a lot has been changed in bettween.

Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
 2011-03-23 09:41:09 -07:00
Eric Rowe
2f97217bfc am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '22e21da663677d12768d38b95d65a747a4a0540b':
  Clean up BT stress tests.
 2011-03-22 19:00:57 -07:00
Eric Rowe
22e21da663 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
 2011-03-22 18:59:00 -07:00
Eric Rowe
5e66ccf5c4 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Eric Fischer
17fd0a4be9 am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05f0b84b23729fcaa2dfe3955a4384b8c9cd440':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:01:10 -07:00
Eric Fischer
b05f0b84b2 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59:20 -07:00
Teng-Hui Zhu
6e5276cf00 am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '2c6f2816d7308693a89f1214c2976512eb275d8a':
  fix for pause when loading
 2011-03-22 13:58:16 -07:00
Eric Fischer
3a2575f7e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
2c6f2816d7 am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -07:00
Eric Fischer
765ae04f61 Import revised translations. DO NOT MERGE 
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
 2011-03-22 13:38:10 -07:00
Teng-Hui Zhu
158fbdb29b fix for pause when loading 
bug:4148903

Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
 2011-03-22 12:02:11 -07:00
repo sync
9ab66ff42f resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp 
Change-Id: Ic82ab20e216d810f6372c833ac49c3856449c09c
 2011-03-22 11:47:39 -07:00
Teng-Hui Zhu
c81d7e0ae8 am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit 'f2c44a79d90096e5f0edf698e27d291d439f0138':
  Fix a crash
 2011-03-21 18:16:02 -07:00
Justin Ho
263fb8285c am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '6a21161095326d097a1af3930b4af0d2470abe0b':
  Fixing list selector theme Bug: 4147203
 2011-03-21 18:14:06 -07:00
Teng-Hui Zhu
f2c44a79d9 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
 2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Simon Wilson
03aa986e6b am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
  DO NOT MERGE Change WiMAX indicator display
 2011-03-21 18:02:57 -07:00
Justin Ho
6a21161095 am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
 2011-03-21 17:59:59 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash 
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
 2011-03-21 17:38:21 -07:00
Simon Wilson
1ba4897e89 Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 2011-03-21 16:58:41 -07:00
TK MUN
081148dd32 DO NOT MERGE Change WiMAX indicator display 
Change WiMAX indicator display from data to signal indication
and add a new icon set.

Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
 2011-03-21 16:55:00 -07:00
Justin Ho
9db9a7d3f4 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Teng-Hui Zhu
67440893ee am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
  Support loading image and paused image for inline video
 2011-03-21 16:28:04 -07:00
Justin Ho
c16168091a Fixing list selector theme 
Bug: 4147203

Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
 2011-03-21 15:04:23 -07:00
Teng-Hui Zhu
f82e5a2c90 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00