Commit Graph

35687 Commits

Author SHA1 Message Date
Jamie Gennis
07ed1a94bc SurfaceTexture: enable a test that now passes.
This change enables the QueryFormatAfterSettingWorks.

Change-Id: Ic868011a36a6c86c8646880246cd5b6960a13364
2011-06-15 12:44:01 -07:00
Jamie Gennis
d05bb2ed4c SurfaceTexture: enable a test that is now passing.
This change enables the TexturingFromCpuFilledYV12BufferPow2 test.

Change-Id: Ib356ee3d2f8979f34f849fd4090f598295e2e92e
2011-06-15 12:44:01 -07:00
Chia-chi Yeh
0ef197ff75 Merge "VPN: change some strings in VPN notifications." 2011-06-15 11:31:34 -07:00
Jeff Sharkey
82c0238a36 Merge "Fix NetworkPolicy tests after notifications." 2011-06-15 11:02:26 -07:00
Debashish Chatterjee
dcb2aa8b25 Merge "Modified Voicemail.SOURCE_DATA value to match with the constant name." 2011-06-15 10:45:03 -07:00
Jeff Sharkey
593ba066d7 Merge "Include template in data warning/limit intents." 2011-06-15 10:36:22 -07:00
Fabrice Di Meglio
66e3f232eb Merge "Fix Gravity start/end" 2011-06-15 10:34:09 -07:00
Elliott Hughes
858d7db171 Merge "de_DE "Mai" isn't an abbreviation." 2011-06-15 10:24:29 -07:00
Daniel Sandler
235ead9633 Merge "Swipe to veto in notifications." 2011-06-15 10:21:44 -07:00
Gilles Debunne
8160090634 Merge "Bug 4579629. Send before and after text when suggestion is picked." 2011-06-15 09:46:55 -07:00
John Reck
e8320bd4f1 Merge "Support for getting the background color" 2011-06-15 09:12:14 -07:00
Daniel Sandler
f831132bb2 am 2897fc4c: am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '2897fc4cc320d9fea2c6a81d7e2b05b6b820acf0':
  One-time-only compatibility mode explanation dialog.
2011-06-15 06:36:56 -07:00
Daniel Sandler
4fc8017fa7 am d163a616: am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit 'd163a6162891f0e14d4536460d839262d2693e9a':
  Final UI for compatibility mode.
2011-06-15 06:36:35 -07:00
Daniel Sandler
a6b1dd29b5 am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit 'fbb093479362865da833b89643a8f58347278bc3':
  One-time-only compatibility mode explanation dialog.
2011-06-15 06:25:35 -07:00
Daniel Sandler
ef6841611a am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '2fdf5880611c333e172d4e0cc2c4259bca324699':
  Final UI for compatibility mode.
2011-06-15 06:25:24 -07:00
Daniel Sandler
c60919e7a3 am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '5994bff92472b3bdcd5754d8a9156b49269a9c1d':
  One-time-only compatibility mode explanation dialog.
2011-06-15 06:15:11 -07:00
Daniel Sandler
96ee0cbcc8 am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '97d5081ac331884fe0f6f2e5814d4862a974fbe3':
  Final UI for compatibility mode.
2011-06-15 06:15:07 -07:00
Daniel Sandler
474a302d5a Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 2011-06-15 06:10:32 -07:00
Daniel Sandler
75566f4bf5 Merge "Final UI for compatibility mode." into honeycomb-mr2 2011-06-15 06:10:27 -07:00
Narayan Kamath
77ae8db510 Merge "Fix a bug in TextToSpeech." 2011-06-15 05:43:34 -07:00
Hung-ying Tyan
887dc8ed6b Merge "Move WakeupTimer out of SipService." 2011-06-15 03:17:50 -07:00
Adam Powell
9316ba2b58 Merge "Make FastScroller behave kinder and gentler when an app decides to return null from SectionIndexer#getSections()" 2011-06-14 22:11:26 -07:00
Jeff Brown
15ba090bcb Merge "Add support for disabling pointer gestures." 2011-06-14 22:08:50 -07:00
Jeff Brown
a9b4f91a29 Merge "EventHub code cleanup." 2011-06-14 22:08:41 -07:00
Dianne Hackborn
01014ab86d am d00bebb0: am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.
* commit 'd00bebb005794afc739f54ff21c6ffd7c866738a':
  Testing done, compatibility mode no longer on by default.
2011-06-14 21:53:25 -07:00
Dianne Hackborn
d94a28e986 am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.
* commit 'abe5bd23c341da035e9905d9e50c1d6bccf229dc':
  Testing done, compatibility mode no longer on by default.
2011-06-14 21:50:56 -07:00
Dianne Hackborn
80dda22726 am a9551706: Testing done, compatibility mode no longer on by default.
* commit 'a9551706a279a798c91d8ef593b2acb16a30c682':
  Testing done, compatibility mode no longer on by default.
2011-06-14 21:47:51 -07:00
Jaikumar Ganesh
2a33242825 Merge "Refactor Bluetooth Profile." 2011-06-14 21:33:03 -07:00
Dianne Hackborn
fa33b1db0e am 27bad6f3: am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
* commit '27bad6f33b98e8d7417a6ce4d7f09b2fa1146379':
  Fix a major problem in fragment lifecycle.
2011-06-14 21:01:45 -07:00
Kristian Monsen
e60730768f Merge "Merge chromium to r11.0.672.0: Compile fix" 2011-06-14 20:57:57 -07:00
Dianne Hackborn
4ce4d45753 am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
  Fix a major problem in fragment lifecycle.
2011-06-14 20:57:48 -07:00
Dianne Hackborn
3ecf5698f0 am ca2832bc: am 027e9e28: am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit 'ca2832bc60b986db245ced0e4a2b8a77d4982f32':
  Fix issue #4592768: Xoom display does not resize when...
2011-06-14 20:57:15 -07:00
Robert Ly
c613e65ce3 am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '2ecb884f7586218a1608cd5b0d82a45de6f9a069':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
2011-06-14 20:57:11 -07:00
Robert Ly
cb02939f1a am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '8a8f82bbd606657df8a804b4cd499556e2292404':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
2011-06-14 20:57:07 -07:00
Robert Ly
561e8d88c6 am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062':
  cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
2011-06-14 20:57:01 -07:00
Robert Ly
665b653b81 am f3c9a251: am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit 'f3c9a2517ad9db2af4e11435068c24410eaf9c57':
  Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
2011-06-14 20:56:57 -07:00
Robert Ly
938e019a9c am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f':
  Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
2011-06-14 20:56:51 -07:00
Amith Yamasani
1a5bd0be5e am 2bcd9c6e: am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '2bcd9c6e7b4fe6c465811e9b8ac48acec23cb341':
  Stability fixes for PreferenceFragments.
2011-06-14 20:56:23 -07:00
Dianne Hackborn
fcca30f52b am f930232f: Fix a major problem in fragment lifecycle.
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
  Fix a major problem in fragment lifecycle.
2011-06-14 20:54:40 -07:00
Dianne Hackborn
f20f12237a Merge "resolved conflicts for merge of e95c07bd to master" 2011-06-14 20:41:27 -07:00
Adam Powell
9bc19dcbee Merge "Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab with null text" 2011-06-14 20:29:03 -07:00
Bart Sears
99b04cf489 Merge "Latest drop of DroidSansFallback.ttf from Monotype" 2011-06-14 20:23:15 -07:00
Dianne Hackborn
d75cefa797 am 027e9e28: am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '027e9e28b2880b8e50912d7c25e68e8f196bb66b':
  Fix issue #4592768: Xoom display does not resize when...
2011-06-14 19:22:42 -07:00
Dianne Hackborn
0c108fb41d am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '4e04380d0a42347013808ee2058c786582ad548f':
  Fix issue #4592768: Xoom display does not resize when...
2011-06-14 19:19:25 -07:00
Dianne Hackborn
ff427a1560 Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 2011-06-14 19:16:46 -07:00
Xia Wang
de27b44084 Merge "Add more opengl benchmark test: - all apps in launcher - shortcuts of apps in home page" 2011-06-14 19:08:22 -07:00
Glenn Kasten
982a69f827 Merge "Bug 4608375" 2011-06-14 17:54:25 -07:00
Robert Ly
88a936ec9c am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit 'b481a6007f3c0e9f50ddb2e126fc5d8188961b25':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
2011-06-14 17:52:55 -07:00
Robert Ly
c8391fcee6 am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '4963cd0bd1d63fe5a444b2299758d2a2696776f1':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
2011-06-14 17:51:08 -07:00
Robert Ly
149c6670e7 am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit 'c7731e070e09007fdd002fd44dfe35bdeffbaac5':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
2011-06-14 17:47:51 -07:00