OSDN Git Service
Matthew Williams [Tue, 25 Mar 2014 10:14:37 +0000 (10:14 +0000)]
am
4bcf922a: am
c798e4f5: am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
4bcf922a55beb0513f7c9cc18c57e6f3d2cd729e':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 10:14:34 +0000 (10:14 +0000)]
am
941eabc2: am
e9b50e75: am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
941eabc24819901f46f15cc1929408574240f64b':
update wear homepage with layout fixes and replace GIFs with smaller versions
Matthew Williams [Tue, 25 Mar 2014 10:04:56 +0000 (10:04 +0000)]
am
c798e4f5: am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
c798e4f5497c39a3c6c14b120cffdee1122a9212':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 10:04:51 +0000 (10:04 +0000)]
am
e9b50e75: am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
e9b50e75a050e75161aa316b0c73bdab500ca14d':
update wear homepage with layout fixes and replace GIFs with smaller versions
Matthew Williams [Tue, 25 Mar 2014 09:57:36 +0000 (09:57 +0000)]
am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
4701b51af216ce2b6fa9fa508ebba47bf13063c7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 09:57:09 +0000 (09:57 +0000)]
am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
9d8184e790b49238fa17cf24bf744596ce1ee195':
update wear homepage with layout fixes and replace GIFs with smaller versions
Selim Cinek [Tue, 25 Mar 2014 04:00:26 +0000 (04:00 +0000)]
am
f7805dd7: am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
f7805dd77aab98bcf2153bdd5e22f1c44beed137':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 04:00:23 +0000 (04:00 +0000)]
am
4668f1ed: am
8ee4491d: am
e05077d7: am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
4668f1ed0d9b4fbb321d25803192d53c31d1ec3d':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Selim Cinek [Tue, 25 Mar 2014 03:54:14 +0000 (03:54 +0000)]
am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
7290b56b51119070c549d88d3946d61e34f62ba3':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 03:54:11 +0000 (03:54 +0000)]
am
8ee4491d: am
e05077d7: am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
8ee4491dc80943429cd79d0c7b87c28056067a58':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Selim Cinek [Tue, 25 Mar 2014 03:46:27 +0000 (03:46 +0000)]
am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
8ae8689d165299bd0bbd0e04bff987dad352c8f5':
Fixed wallpaper bug where wrong size was taken when cropping
Gabriel Peal [Tue, 25 Mar 2014 03:46:17 +0000 (03:46 +0000)]
am
e05077d7: am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
e05077d78c9abde054a754db53e71c647b9a705c':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Chong Zhang [Tue, 25 Mar 2014 00:26:11 +0000 (00:26 +0000)]
am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
c4e6233b2097dbd23927a9a247229ab67f41e4f8':
DO NOT MERGE change Surface constructor arg to 64bit
Chong Zhang [Tue, 25 Mar 2014 00:20:03 +0000 (00:20 +0000)]
am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
b68d38e81fd779011e478dcf9911fbe77f71f20e':
DO NOT MERGE change Surface constructor arg to 64bit
Matthew Williams [Mon, 24 Mar 2014 22:39:21 +0000 (22:39 +0000)]
am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
bb87ac7f9733ca9b490cb34e8a675dba083a57b7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Mon, 24 Mar 2014 22:14:29 +0000 (22:14 +0000)]
am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
779174ea182908e18d821656fc408697485a1f7a':
update wear homepage with layout fixes and replace GIFs with smaller versions
Matthew Williams [Mon, 24 Mar 2014 21:42:06 +0000 (14:42 -0700)]
DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug:
12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.
Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
DO NOT MERGE change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
(cherry picked from commit
af608e81d450b962a443a21fb1a6feadeb355fe1)
Scott Main [Mon, 24 Mar 2014 20:53:24 +0000 (13:53 -0700)]
update wear homepage with layout fixes and replace GIFs with smaller versions
Change-Id: I2e0b4efed83a4de7e095ece18d3c73634a23f964
John Spurlock [Mon, 24 Mar 2014 17:51:01 +0000 (17:51 +0000)]
am
e2cae0a6: am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
e2cae0a6578596f9c87b970650a9cc234b32cb04':
Unhide Notification kind, rename to category.
John Spurlock [Mon, 24 Mar 2014 17:44:53 +0000 (17:44 +0000)]
am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
Unhide Notification kind, rename to category.
John Spurlock [Mon, 24 Mar 2014 17:38:44 +0000 (17:38 +0000)]
Merge "Unhide Notification kind, rename to category." into klp-modular-dev
Selim Cinek [Mon, 24 Mar 2014 16:25:09 +0000 (16:25 +0000)]
am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
c41853cee89b391cd2d4d93205ea69c746ccfa4c':
Fixed wallpaper bug where wrong size was taken when cropping
Jose Lima [Mon, 24 Mar 2014 15:59:36 +0000 (15:59 +0000)]
am
d13d7016: am
eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev
* commit '
d13d701681220cdcb61b5a62669e88bb77d156aa':
Added isGame application tag to the manifest
Jose Lima [Mon, 24 Mar 2014 15:53:24 +0000 (15:53 +0000)]
am
eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev
* commit '
eb2c85df4b2d8ea5dd3cd08cb0367d5ff666afe6':
Added isGame application tag to the manifest
Jose Lima [Mon, 24 Mar 2014 15:49:17 +0000 (15:49 +0000)]
Merge "Added isGame application tag to the manifest" into klp-modular-dev
Mark Renouf [Mon, 24 Mar 2014 15:33:12 +0000 (15:33 +0000)]
am
3796594c: am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
3796594cd76238c46dd79a990ae1797f197dea85':
Run finalizers before counting for StrictMode.
Mark Renouf [Mon, 24 Mar 2014 15:27:45 +0000 (15:27 +0000)]
am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
a63cd9f424d70a3f8ca059aa8f76b28be1f9fa07':
Run finalizers before counting for StrictMode.
Mark Renouf [Mon, 24 Mar 2014 15:22:55 +0000 (15:22 +0000)]
Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
John Spurlock [Mon, 24 Mar 2014 15:02:36 +0000 (11:02 -0400)]
Unhide Notification kind, rename to category.
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
Craig Mautner [Mon, 24 Mar 2014 14:44:17 +0000 (14:44 +0000)]
am
b98ee1eb: am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
b98ee1eb50389520fd06255fd38b233c7adf5814':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:38:33 +0000 (14:38 +0000)]
am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
103ed3558764f1fd41c9a5399e2030baa4110bfb':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:34:59 +0000 (07:34 -0700)]
am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:31:38 +0000 (14:31 +0000)]
Merge "Set ScreenshotSurface secure if any secure content is shown."
Selim Cinek [Mon, 24 Mar 2014 12:53:06 +0000 (13:53 +0100)]
Fixed wallpaper bug where wrong size was taken when cropping
When cropping, the selected area of the image was incorrectly
cropped to the size of the view instead of the size of the image
Bug:
13617446
Change-Id: If54a0891fa2cdeee70ba63752874f1543d401701
Jinsuk Kim [Mon, 24 Mar 2014 12:34:15 +0000 (12:34 +0000)]
am
3c34e5db: am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
3c34e5dbbb99d3d66f71eea5db6e001cc5495263':
Add HdmiCecManager
Jinsuk Kim [Mon, 24 Mar 2014 12:26:51 +0000 (12:26 +0000)]
am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
Add HdmiCecManager
Jinsuk Kim [Sun, 23 Mar 2014 23:24:44 +0000 (23:24 +0000)]
Merge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Fri, 21 Mar 2014 07:25:13 +0000 (16:25 +0900)]
Add HdmiCecManager
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).
Change-Id: I39da071a328074a4b7b049947943688bd7779c26
Gabriel Peal [Sat, 22 Mar 2014 23:35:00 +0000 (23:35 +0000)]
am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
83da75d938d519bbcffb9c3b52802fd2daad4aee':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
The first set of these APIs is for telephony:
Added some APIs to ITelephony and created a first party framework for them
toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)
Bug:
13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
quddusc [Sat, 22 Mar 2014 09:41:12 +0000 (09:41 +0000)]
am
5771d425: am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
5771d42544ddc46f82c1b793d361df30c6fc90bf':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 09:41:08 +0000 (09:41 +0000)]
am
3ee70ca4: am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
3ee70ca452b3f0bf9482b6c18d18b9c03be07422':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 09:30:56 +0000 (09:30 +0000)]
am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
5b2e92e37b41b1497b240d41df471081c9dfdc56':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 09:30:42 +0000 (09:30 +0000)]
am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
9c1eaeb0b4f942b2163175c846e1c08ed4b14cbf':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 04:09:04 +0000 (04:09 +0000)]
am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
529d47ace907c9d961e2c1fb2e4e68ff24833e72':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 04:08:59 +0000 (04:08 +0000)]
am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
ff2599f9b2f25179cad9631181216f2d24255901':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 00:01:20 +0000 (00:01 +0000)]
am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
e9863dbe0665d5ce6dd46d673034a488b7637aff':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 00:01:16 +0000 (00:01 +0000)]
am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
0802b4fb391eecf37626d3d57f5e07eeb32a3185':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Fri, 21 Mar 2014 23:55:42 +0000 (23:55 +0000)]
Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
quddusc [Fri, 21 Mar 2014 23:55:34 +0000 (23:55 +0000)]
Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
quddusc [Thu, 20 Mar 2014 21:31:35 +0000 (14:31 -0700)]
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
Change-Id: Idc5dc716aa92c752b8dcd1967958d9d46521dfa6
Selim Cinek [Fri, 21 Mar 2014 23:01:24 +0000 (23:01 +0000)]
am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
d9e5761a4e62d49212ed22e20840ddb4413ae9e0':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:52:52 +0000 (22:52 +0000)]
am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
04ea3ca000312f4eccc44347c37c49471081b852':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:46:33 +0000 (22:46 +0000)]
am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
50ac19e9b8d3435eab44cacbb62c5081f44df910':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:41:07 +0000 (22:41 +0000)]
am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit
0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
Jose Lima [Fri, 14 Mar 2014 23:55:12 +0000 (16:55 -0700)]
Added isGame application tag to the manifest
Added the ability to flag applications as Games in the manifest,
so they can receive a different treatment in the UI.
Change-Id: I4c36bc1a96757030fad58ee050cd68491b31bb6c
Chad Brubaker [Fri, 21 Mar 2014 21:16:46 +0000 (21:16 +0000)]
am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
05e4dc96fbe47480fcd639ac679683c90ba07484':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:16:43 +0000 (21:16 +0000)]
am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
9506e84b6f1b8a63abd5c7ecd580548386cc9aae':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)]
am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
850eb678d7356ea60925dc6fa450e213d5cea2d5':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:09:41 +0000 (21:09 +0000)]
am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
c77261471432e1577586395dd0a6a481ef7431b5':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 21:02:47 +0000 (21:02 +0000)]
am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:02:43 +0000 (21:02 +0000)]
am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 20:56:41 +0000 (20:56 +0000)]
am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 20:56:37 +0000 (20:56 +0000)]
am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
de4e7b4947998638e0345ab9a181bf35a8827bef':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 20:52:14 +0000 (20:52 +0000)]
Merge "Fix support for simultaneous VPN tuns" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:52:04 +0000 (20:52 +0000)]
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
Ricardo Cervera [Fri, 21 Mar 2014 20:24:13 +0000 (20:24 +0000)]
am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
419b17ec9e8520b8d38b3f8db6d6fe5b0fce1211':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:18:29 +0000 (20:18 +0000)]
am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
1d77a8741c8b08c2b911e714c56521483e23bdac':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:11:48 +0000 (20:11 +0000)]
am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
588300cb5211f7217b81683f8a76bdf95c7bfa8d':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:06:06 +0000 (20:06 +0000)]
am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
2e92965820d61b704e0eb307da70825c46d899d3':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:01:31 +0000 (20:01 +0000)]
Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
John Reck [Fri, 21 Mar 2014 19:59:38 +0000 (19:59 +0000)]
am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
ae31664390a95b1a0b80bf7aa246b8413b469ea7':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:53:17 +0000 (19:53 +0000)]
am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
aff40e25e8f16c3ecd20376901d7062774850023':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:47:22 +0000 (19:47 +0000)]
am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:41:00 +0000 (19:41 +0000)]
am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
abf701e6751aed487d4ed0986e0fae8810c3658f':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Eliminate mHasAlpha" into klp-dev
Unsuk Jung [Fri, 21 Mar 2014 19:23:46 +0000 (19:23 +0000)]
am
7bde0fc7: am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
7bde0fc751192fd70f6e42ddffe7f1513fc67b71':
Change wallpaper sizing
Unsuk Jung [Fri, 21 Mar 2014 19:17:01 +0000 (19:17 +0000)]
am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
Change wallpaper sizing
Unsuk Jung [Fri, 21 Mar 2014 19:11:01 +0000 (19:11 +0000)]
am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
8114c3d02d6bf72c0627aea6ecf738074ac3f232':
Change wallpaper sizing
Will Haldean Brown [Fri, 21 Mar 2014 19:08:57 +0000 (19:08 +0000)]
am
ccd55a92: am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
ccd55a924a51e5ad7a503b3bde4b3038152217e4':
Update current.txt to include windowSwipeToDismiss
Unsuk Jung [Fri, 21 Mar 2014 19:05:40 +0000 (19:05 +0000)]
am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
Change wallpaper sizing
Will Haldean Brown [Fri, 21 Mar 2014 19:02:16 +0000 (19:02 +0000)]
am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
f8c78b50fc9f6c81c7ad5d76c81445653dcf3cd9':
Update current.txt to include windowSwipeToDismiss
Unsuk Jung [Fri, 21 Mar 2014 19:01:08 +0000 (19:01 +0000)]
Merge "Change wallpaper sizing" into klp-dev
Alex Klyubin [Fri, 21 Mar 2014 18:53:20 +0000 (18:53 +0000)]
am
92ec0a0c: am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
92ec0a0c7a568a77696964c16f4e44292c633ef1':
Adjust to the change in the private SSLParameterImpl API.
Alex Klyubin [Fri, 21 Mar 2014 18:47:27 +0000 (18:47 +0000)]
am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
d8c32164e19d16cf7d66b9aee368369ae16a4f0d':
Adjust to the change in the private SSLParameterImpl API.
Alex Klyubin [Fri, 21 Mar 2014 18:41:38 +0000 (11:41 -0700)]
am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
88517170cbb09b45324d5b457a0e5e840cc7d09b':
Adjust to the change in the private SSLParameterImpl API.
Alex Klyubin [Fri, 21 Mar 2014 18:36:07 +0000 (18:36 +0000)]
Merge "Adjust to the change in the private SSLParameterImpl API."
Will Haldean Brown [Fri, 21 Mar 2014 18:33:40 +0000 (11:33 -0700)]
Update current.txt to include windowSwipeToDismiss
Change-Id: I5cbee85f7fe852e534a722083feead7359404732
John Reck [Fri, 21 Mar 2014 18:09:45 +0000 (11:09 -0700)]
Eliminate mHasAlpha
Bug:
13580771
The cached value mHasAlpha on Bitmap could get out of sync with the
real value stored in the SkBitmap. Fix this by just eliminating the
cached value. This adds an extra JNI call in copy(), createBitmap(),
and setPremultiplied(), none of which are going to be significantly
impacted by the extra JNI call.
Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
Alex Klyubin [Fri, 21 Mar 2014 18:13:50 +0000 (11:13 -0700)]
Adjust to the change in the private SSLParameterImpl API.
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.
Bug:
13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
Jeff Sharkey [Fri, 21 Mar 2014 18:06:44 +0000 (18:06 +0000)]
am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
cf0c4a59b6d6c7d0abe6b643e200af2eb9f0d6b2':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 18:06:41 +0000 (18:06 +0000)]
am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
aa0fa8eb08043e4c070c6c0db07678cf1f8f8a99':
Fix link in documentation for SWIPE_TO_DISMISS.
Jeff Sharkey [Fri, 21 Mar 2014 18:00:13 +0000 (18:00 +0000)]
am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
4868da52450d3e5456b3567c228967539144d108':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 18:00:09 +0000 (18:00 +0000)]
am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
cedbfad48753b4e266405f677cd0f13156d0c61d':
Fix link in documentation for SWIPE_TO_DISMISS.
Jeff Sharkey [Fri, 21 Mar 2014 17:56:44 +0000 (17:56 +0000)]
am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
c620ec3614c8737b87d60efa9db96c288bcad794':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 17:50:44 +0000 (10:50 -0700)]
Fix link in documentation for SWIPE_TO_DISMISS.
Change-Id: I3ff1fb1ae97b088e6b2e1a7a2c27981e7220cc2e
Jeff Sharkey [Fri, 21 Mar 2014 17:50:39 +0000 (17:50 +0000)]
am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
3f5232220f2db839f690489ed272113f660daa40':
Lock down MANAGE_DOCUMENTS permission.
Jeff Sharkey [Fri, 21 Mar 2014 17:47:00 +0000 (17:47 +0000)]
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev