Chet Haase
cfbbc864da
Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev
2013-05-23 18:23:34 +00:00
kmccormick
5482b65ae8
am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9':
Doc update: fix GCM TOC
2013-05-23 10:56:56 -07:00
kmccormick
88f24e6fe8
am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
Doc update: fix GCM TOC
2013-05-23 10:54:10 -07:00
kmccormick
84fb096ee7
am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
Doc update: fix GCM TOC
2013-05-23 10:51:49 -07:00
kmccormick
e56e2483c5
am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit '7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
Doc update: fix GCM TOC
2013-05-23 10:49:58 -07:00
kmccormick
7b1adeb80a
am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
...
* commit 'c6c149aa14610925158ef1ba6320c9356e45e631':
Doc update: fix GCM TOC
2013-05-23 10:47:13 -07:00
kmccormick
c6c149aa14
Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
2013-05-23 17:45:26 +00:00
Baligh Uddin
a9a0409d62
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-23 16:14:16 +00:00
Chet Haase
c725903eec
Restore previous alpha value on noop'd DisplayList operations
...
Previously, when a DisplayList operation was rejected because it was not
in the clip bounds, the code would not properly restore the previous
state, leading to errors in alpha values of the noop'd op being applied
to unrelated operations later in the DisplayList.
Issue #9051935 Flash of grey background when transitioning to conversation view
Change-Id: I56645cc9ebf2e07be0228ca5e249213dbeb10d7d
2013-05-23 07:57:17 -07:00
Amith Yamasani
60b4afedbe
Merge "Fix account filtering for specific package name" into jb-mr2-dev
2013-05-23 14:39:07 +00:00
Baligh Uddin
b52156cd67
Import translations. DO NOT MERGE
...
Change-Id: I8af9de6adcf346f5d2b9241eceefdc42a4c42026
Auto-generated-cl: translation import
2013-05-22 22:14:01 -07:00
Amith Yamasani
e342309704
Fix account filtering for specific package name
...
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.
Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
2013-05-22 19:41:45 -07:00
kmccormick
cd7e9ebbba
Doc update: fix GCM TOC
...
Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b
2013-05-22 18:25:21 -07:00
Ying Wang
1fa3cdf0cb
Merge "Move offline-pdk to where the source is." into jb-mr2-dev
2013-05-23 00:56:20 +00:00
Scott Main
9d38ba200e
am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
...
* commit 'cfc593d5736b627e0fffe92e511ee326b9f6d326':
add VID for Haier to docs
2013-05-22 17:10:28 -07:00
Scott Main
cfc593d573
am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
...
* commit '38b9aaa0fc1b49fa4e734bb0eba28711b6b0d165':
add VID for Haier to docs
2013-05-22 17:08:20 -07:00
Scott Main
38b9aaa0fc
am 2cc84c63: add VID for Haier to docs
...
* commit '2cc84c638a3a1048d9704a8c987d1436dd27fcd6':
add VID for Haier to docs
2013-05-22 17:06:45 -07:00
Jeff Brown
d6619ed89f
Merge "Add a queue of pending finished input events." into jb-mr2-dev
2013-05-22 22:44:17 +00:00
Jeff Tinker
606ab4706d
Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev
2013-05-22 19:12:39 +00:00
Jeff Tinker
2161b7cb79
Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev
2013-05-22 19:12:00 +00:00
Jeff Brown
56513492ea
Add a queue of pending finished input events.
...
Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly. Handle this situation by queuing
up the pending finish events until the socket becomes writable again.
Bug: 9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf
2013-05-22 10:33:48 -07:00
Scott Main
2cc84c638a
add VID for Haier to docs
...
Change-Id: I3999d2b9d712ac3f5d2ce6325a30d07a743dbc15
2013-05-22 08:34:49 -07:00
Adam Koch
d51fc5763d
am 3e4ea33f: am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
...
* commit '3e4ea33f087926d9039f7b4428dc967a8e760209':
Doc change: fix minor typo in ContactsContract.RawContacts.
2013-05-22 06:52:00 -07:00
Adam Koch
3e4ea33f08
am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
...
* commit '4f6d0cbdd9372754b1b5b112e2b724b3852ac12b':
Doc change: fix minor typo in ContactsContract.RawContacts.
2013-05-22 06:49:43 -07:00
Adam Koch
4f6d0cbdd9
am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
...
* commit '7258e6bc57fb3cb023a4ca219f1355cf55ea93bf':
Doc change: fix minor typo in ContactsContract.RawContacts.
2013-05-22 06:45:33 -07:00
Adam Koch
7258e6bc57
am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
...
* commit '1fc7e59b3301bb74223393354571ad4e6b7ecfce':
Doc change: fix minor typo in ContactsContract.RawContacts.
2013-05-22 06:43:16 -07:00
Adam Koch
1fc7e59b33
am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
...
* commit '14233ee5d06c468f953dff2d900a9cf32f9737c0':
Doc change: fix minor typo in ContactsContract.RawContacts.
2013-05-22 06:41:26 -07:00
Adam Koch
14233ee5d0
Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
2013-05-22 13:36:57 +00:00
Romain Guy
2f35d2441e
Merge "Avoid extraneous EGL surface allocations Bug #8667873 " into jb-mr2-dev
2013-05-22 02:08:24 +00:00
Ying Wang
06acbf0e89
Move offline-pdk to where the source is.
...
Change-Id: I10b05c28954a27f11482751e14287ec21422dce2
2013-05-21 18:03:29 -07:00
Jeff Tinker
17b8922785
Fix invalid keyType translation in MediaDrm.getKeyRequest
...
bug: 9070897
Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
2013-05-21 13:00:58 -07:00
Jeff Tinker
eada5376d9
Improve exception error messages to help diagnose app errors
...
bug: 9072051
Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
2013-05-21 12:55:59 -07:00
Robert Greenwalt
4c32885c42
Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev
2013-05-21 19:54:39 +00:00
Romain Guy
370ab062a0
Avoid extraneous EGL surface allocations
...
Bug #8667873
windowShouldResize means we need to layout the window, it doesn't mean
the dimensions of the surface have changed. We should only check the
width and the height. With this fix we can avoid a surface allocation
every time the window shade is opened or closed.
Change-Id: I8afe97b820a865723f2aab7a5aa4ddc8eaaec6e1
2013-05-21 12:15:07 -07:00
Jeff Brown
acad301ae7
Merge "Update media route picker button assets." into jb-mr2-dev
2013-05-21 18:37:07 +00:00
Robert Greenwalt
8c77692554
Don't put up wifi-available note when disabled
...
With the new scan-always mode we will get scan results when disabled.
Don't tell the user about open AP when they've turned off wifi.
bug:9067982
Change-Id: I7a303c2a6f87a331443eeb54fa8ff5b467c0a1ff
2013-05-21 11:17:11 -07:00
Jay Shrauner
34bed42067
Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
2013-05-21 17:59:25 +00:00
Daniel Sandler
f5ceaf4b19
Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
2013-05-21 17:35:17 +00:00
Dirk Dougherty
d258b1efe7
am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '2d31a8e85ca9e10c1dca720e89f2caa15dfd6e45':
Doc change: fix doc title.
2013-05-21 10:21:34 -07:00
Dirk Dougherty
2d31a8e85c
am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit 'a3d5a7a90fc9029e82e9e5cb64e789854ef99506':
Doc change: fix doc title.
2013-05-21 10:19:39 -07:00
Scott Main
dad413d01e
am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
...
* commit 'c778584443cfb3af5a4f449959e16997edede266':
add search tag for swipe view lesson
2013-05-21 10:15:36 -07:00
Dirk Dougherty
a3d5a7a90f
am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '0269b3dde009650192a3a746929e5f4c8b54e0c2':
Doc change: fix doc title.
2013-05-21 10:14:58 -07:00
Scott Main
c778584443
am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
...
* commit 'e6fbd9ed6f9bda28d1279d4b762d8f0ab885ab47':
add search tag for swipe view lesson
2013-05-21 10:14:03 -07:00
Dirk Dougherty
0269b3dde0
am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '6a4214f065d05e9ec0480929c2ed800d0e3a86f8':
Doc change: fix doc title.
2013-05-21 10:12:55 -07:00
Scott Main
e6fbd9ed6f
am 86c25dec: add search tag for swipe view lesson
...
* commit '86c25decc05bcf9f3085ccbcfb18e31d6d010970':
add search tag for swipe view lesson
2013-05-21 10:11:41 -07:00
Dirk Dougherty
6a4214f065
am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit 'a963459e3f96f2b27d87e3fccdfa8fb98f0f9ab6':
Doc change: fix doc title.
2013-05-21 10:07:03 -07:00
Dirk Dougherty
a963459e3f
Merge "Doc change: fix doc title." into jb-mr1.1-docs
2013-05-21 17:05:08 +00:00
Dirk Dougherty
07340d636d
Doc change: fix doc title.
...
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
2013-05-21 10:03:35 -07:00
Adam Koch
95e5a07448
Doc change: fix minor typo in ContactsContract.RawContacts.
...
Change-Id: I31dbc85449fa81c9f5ea61fdaa0d4a89cf97cd86
2013-05-21 10:09:16 -04:00
Scott Main
b59cf5659d
am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
...
* commit 'e205386e1ef1364977fe9c0aeb5bf0d6dbe0fd44':
delete orphaned and obsolete files
2013-05-21 02:31:16 -07:00
