Commit Graph

14976 Commits

Author SHA1 Message Date
Robert Greenwalt
8a3b2cf4c8 am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp

* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
  Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
8e1b0077ad Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:09:31 -07:00
Dan Egnor
305da2ed58 am 9a907e75: am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:59:49 -07:00
Dan Egnor
9f64437615 am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:57:02 -07:00
Dan Egnor
00e55cbf87 am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken

* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
  Change TrafficStats to a new JNI implementation.
2010-04-08 14:53:06 -07:00
Dan Egnor
02b338b7f2 am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp

* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
  Change TrafficStats to a new JNI implementation.
2010-04-08 14:48:50 -07:00
Dan Egnor
efdccf3ebb Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
4a360c3ff6 am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:28:29 -07:00
Dan Egnor
22a2329d02 am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:24:15 -07:00
Dan Egnor
1dbebb2627 am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken

* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
  Missed these ones in the previous rename.
2010-04-08 14:19:52 -07:00
Grace Kloba
42005b7803 am f1055bd5: am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during 2010-04-08 14:19:38 -07:00
Grace Kloba
b9a17d49fa am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, 2010-04-08 14:17:15 -07:00
Dan Egnor
7f22a7ccd1 am 21248080: Merge "Missed these ones in the previous rename." into froyo
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp

* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
  Missed these ones in the previous rename.
2010-04-08 14:15:29 -07:00
Brad Fitzpatrick
6123758361 am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo 2010-04-08 14:14:46 -07:00
Scott Main
4ff71b32f0 Merge "docs: rewrite resources documentation" 2010-04-08 14:13:10 -07:00
Grace Kloba
187a98c25e am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate ca
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken

* commit '642d1556f13ac13f07515309288214e532029c50':
  For performance reason, we choose to block the picture
2010-04-08 14:12:58 -07:00
Brad Fitzpatrick
4c060a7e09 am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo 2010-04-08 14:12:20 -07:00
Dan Egnor
2728e5f544 Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:10:50 -07:00
Brad Fitzpatrick
e15bd8ec0c am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken

* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
  Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Grace Kloba
f11f1e8c89 am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%.
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp

* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
  For performance reason, we choose to block the picture
2010-04-08 14:08:35 -07:00
Grace Kloba
b2a21d6ac3 Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo 2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
ab7954a0b0 am c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp

* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
  Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
b56b5fd4fc Merge "Rename logtag for clarity." into froyo 2010-04-08 14:01:23 -07:00
Jeff Brown
7d31f9aa5f am 281a687c: am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 2010-04-08 13:58:54 -07:00
Andreas Huber
6fe2e0b3d7 am 3bf36221: am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 13:56:19 -07:00
Robert Greenwalt
339b90e023 resolved conflicts for merge of 4e33e9c1 to master
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Jeff Brown
f00c611c90 am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 2010-04-08 13:54:12 -07:00
Jeff Brown
23605c9bea am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken

* commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:51:48 -07:00
Jeff Brown
bd2c3a73d0 am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp

* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:49:55 -07:00
Andreas Huber
3d46683ef2 am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 12:53:23 -07:00
Robert Greenwalt
71329eee0a am 6646cf7a: am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:53:18 -07:00
Andreas Huber
a7171fb1d7 am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Merge commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken

* commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c':
  Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:49:41 -07:00
Robert Greenwalt
f4b6a4e7f3 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Andreas Huber
376f0c3ee6 am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp

* commit 'eb12e45f7a92fd424988451256c82605d086245d':
  Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:45:59 -07:00
Robert Greenwalt
53b96a3c8e am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Andreas Huber
d85bfb3a14 Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 12:44:33 -07:00
Robert Greenwalt
98b863760c Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Dianne Hackborn
dd8f92ca85 am 306e2b50: am 2be9a0e7: am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:45:21 -07:00
The Android Open Source Project
cbfcc9ce29 am 5e78c1f4: am c9522c95: am 727cec02: merge from open-source master 2010-04-08 11:45:17 -07:00
Dianne Hackborn
ec402586b6 am 2be9a0e7: am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:43:06 -07:00
The Android Open Source Project
f7c37ef1ad am c9522c95: am 727cec02: merge from open-source master 2010-04-08 11:43:03 -07:00
Dianne Hackborn
809a225e3a am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '2c5c9bb89b539a1a97d093a54669bf2242697410' into kraken

* commit '2c5c9bb89b539a1a97d093a54669bf2242697410':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
2010-04-08 11:41:38 -07:00
The Android Open Source Project
76209e94ba am 727cec02: merge from open-source master
Merge commit '727cec02daa66b5e984aff277185d503fabe5d51' into kraken

* commit '727cec02daa66b5e984aff277185d503fabe5d51':
  Fix reporting of window visibility in WindowManagerService.
2010-04-08 11:39:51 -07:00
Dianne Hackborn
6286f57ea6 am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp

* commit '2670105ee6929d3036a1a7134400730f214f0f7e':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
2010-04-08 11:39:03 -07:00
The Android Open Source Project
1ce8693377 am 4a78a4fe: am 892debc6: am 65369424: merge from open-source master 2010-04-08 11:37:37 -07:00
Scott Main
b7e4eecd6a am 5d1b63c5: am bc494d43: am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:37:32 -07:00
The Android Open Source Project
d1f9f3e832 merge from open-source master
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
2010-04-08 11:35:37 -07:00
Dianne Hackborn
be4143d514 Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:35:27 -07:00
The Android Open Source Project
349658c055 am 892debc6: am 65369424: merge from open-source master 2010-04-08 11:33:28 -07:00
Scott Main
10161f519d am bc494d43: am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:33:24 -07:00