OSDN Git Service
Jeff Brown [Tue, 28 May 2013 22:52:22 +0000 (15:52 -0700)]
am
c8a77735: am
dea6e86d: am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
c8a777356267803be3e235b2fdaf807166fb46eb':
Bug fix for building the hover target list
Jeff Brown [Tue, 28 May 2013 22:49:13 +0000 (15:49 -0700)]
am
dea6e86d: am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
dea6e86dce716b67fe92c9b281fe9e79256f3b78':
Bug fix for building the hover target list
Jeff Brown [Tue, 28 May 2013 22:48:47 +0000 (15:48 -0700)]
am
ef0c3e26: am
c8c82009: resolved conflicts for merge of
7573e594 to stage-aosp-master
* commit '
ef0c3e269f15200a3a1111ce9f80516b2d38590a':
Properly rotate full [-pi, +pi] orientation range if available
Jeff Brown [Tue, 28 May 2013 22:46:00 +0000 (15:46 -0700)]
am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
3422ceb6ba453c28ac39dfce34534e0346394a3a':
Bug fix for building the hover target list
Jeff Brown [Tue, 28 May 2013 22:45:43 +0000 (15:45 -0700)]
am
c8c82009: resolved conflicts for merge of
7573e594 to stage-aosp-master
* commit '
c8c82009dc8c146efadac6b51702922148f6003f':
Properly rotate full [-pi, +pi] orientation range if available
Jeff Brown [Tue, 28 May 2013 22:43:16 +0000 (15:43 -0700)]
resolved conflicts for merge of
7573e594 to stage-aosp-master
Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f
John Spurlock [Tue, 28 May 2013 22:23:16 +0000 (22:23 +0000)]
Merge "Hideybars feature confirmation toast bar."
Romain Guy [Tue, 28 May 2013 22:01:19 +0000 (22:01 +0000)]
Merge "Re-initialize the 9patch cache if cleared with onTrimMemory"
Romain Guy [Tue, 28 May 2013 21:25:09 +0000 (14:25 -0700)]
Re-initialize the 9patch cache if cleared with onTrimMemory
The 9aptch cache was reinitialized after destroying/recreating
the EGL context but not after clearing it during a normal
memory trim.
Change-Id: If6155bfc8a62439e9878bc742a4766b3bd6c6aec
Chris Craik [Tue, 28 May 2013 21:31:54 +0000 (21:31 +0000)]
Merge "Support larger bitmaps in BitmapFactory.Options.inBitmap"
Jeff Brown [Tue, 28 May 2013 20:51:01 +0000 (13:51 -0700)]
am
dcb8d876: am
79df1e65: am
e2a281ca: Merge "Add additional Method that check whether a table is empty or not"
* commit '
dcb8d876581f9bf77e51c5539ef68993870264d8':
Add additional Method that check whether a table is empty or not
Scott Main [Tue, 28 May 2013 20:50:57 +0000 (13:50 -0700)]
am
2ee100c0: am
e0329cae: am
5bd67944: am
5fbe17fe: am
27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '
2ee100c0999e15d11ad36f387a22d9500eb14a6f':
update eclipse download URL; /mobile URL will be deprecated
John Spurlock [Tue, 28 May 2013 20:50:36 +0000 (13:50 -0700)]
am
be7a7e54: am
ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
* commit '
be7a7e546f409442c2f6505dd7a0526553fa395c':
Fix typo in View.java javadocs
Chris Craik [Tue, 21 May 2013 01:13:47 +0000 (18:13 -0700)]
Support larger bitmaps in BitmapFactory.Options.inBitmap
bug:
8121994
Adds a new distiction between bitmap size and the allocation
(pixel ref/buffer) used to store its data.
BitmapFactory.inBitmap will allow a bitmap to be reinitialized with
new data if the bitmap being decoded is (after sampleSize) equal or
smaller.
Change-Id: I747750a735c858882df3af74fca6cdc46f2a9f81
Scott Main [Tue, 28 May 2013 20:50:32 +0000 (13:50 -0700)]
am
1a4022c8: am
0e11e8ef: am
6e5ee7dd: am
ea325978: am
005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '
1a4022c8a625436e00fb3174b287c33dd85a45be':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 20:50:28 +0000 (13:50 -0700)]
am
a0ac0f15: am
597a8374: am
afaff6e2: am
fb22f9cb: am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
a0ac0f15cd8c8ed3a61cd41ce932dd3c860ce0e5':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 20:50:25 +0000 (13:50 -0700)]
am
5215f439: am
0b92682d: am
43fa2b88: am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
5215f4399253d7444d094343429ce6277864f7a7':
new android studio download v0.1.1
The Android Open Source Project [Tue, 28 May 2013 20:50:22 +0000 (13:50 -0700)]
am
a5033158: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a503315865507129e93efe15b281dd0ba98e6da3':
Matthew Xie [Tue, 28 May 2013 20:50:13 +0000 (13:50 -0700)]
am
e7e6bf9f: am
27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '
e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086':
Revert "Change GATT_FAILURE from 0 to 0x101"
Matthew Xie [Tue, 28 May 2013 20:50:09 +0000 (13:50 -0700)]
am
84e1afcc: am
413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '
84e1afcccc328e7a52bfde16e824a3ed37889d1d':
Change GATT_FAILURE from 0 to 0x101
Dianne Hackborn [Tue, 28 May 2013 20:50:05 +0000 (13:50 -0700)]
am
66e596e7: am
840f1143: am
7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '
66e596e788761e1168805304d2f5fc93c1f2fbcd':
Fix wrong log information in DevicePolicyManagerService
Dianne Hackborn [Tue, 28 May 2013 20:50:02 +0000 (13:50 -0700)]
am
23b07d55: am
43861f9d: am
f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '
23b07d5549bf38cfea388b439ac519670be6e7e2':
Avoid IllegalArgumentException in Preference.java compareTo()
Dianne Hackborn [Tue, 28 May 2013 20:49:59 +0000 (13:49 -0700)]
am
4e73e8a8: am
95b79966: am
0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '
4e73e8a817ff99a19ba9ed6fa68754007731406d':
Fix CalendarView to show the month title properly.
Dianne Hackborn [Tue, 28 May 2013 20:49:56 +0000 (13:49 -0700)]
am
89eed125: am
c7322005: am
f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit '
89eed125590c6286fa64e9074e95196c8cc4bd27':
Don't include flags in configuration change if their value hasn't changed.
Dianne Hackborn [Tue, 28 May 2013 20:49:53 +0000 (13:49 -0700)]
am
959b9b39: am
fc09b326: am
fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '
959b9b39b4e488b643919fb7a58f2fbbdd70e573':
Fix documentation of requestCode parameter.
Dianne Hackborn [Tue, 28 May 2013 20:49:50 +0000 (13:49 -0700)]
am
d031f9c7: (-s ours) am
087384b0: am
f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit '
d031f9c7b7f9b28021abe32b0e0be2033dbec0ae':
Framework/base: Added synchronization block to avoid race condition
Jeff Brown [Tue, 28 May 2013 20:04:23 +0000 (20:04 +0000)]
Merge "Bug fix for building the hover target list"
Jeff Brown [Tue, 28 May 2013 20:00:28 +0000 (13:00 -0700)]
am
79df1e65: am
e2a281ca: Merge "Add additional Method that check whether a table is empty or not"
* commit '
79df1e65455fdb69f07675cffae99dea06a5afb2':
Add additional Method that check whether a table is empty or not
Jeff Brown [Tue, 28 May 2013 19:57:59 +0000 (12:57 -0700)]
am
e2a281ca: Merge "Add additional Method that check whether a table is empty or not"
* commit '
e2a281ca85f17eaf6d47978c76d2cafb0fa81782':
Add additional Method that check whether a table is empty or not
Jeff Brown [Tue, 28 May 2013 19:56:19 +0000 (19:56 +0000)]
Merge "Properly rotate full [-pi, +pi] orientation range if available"
Jeff Brown [Tue, 28 May 2013 19:55:25 +0000 (19:55 +0000)]
Merge "Add additional Method that check whether a table is empty or not"
Scott Main [Tue, 28 May 2013 18:51:08 +0000 (11:51 -0700)]
am
e0329cae: am
5bd67944: am
5fbe17fe: am
27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '
e0329cae82dac7a650d505f9baafbd98e511e339':
update eclipse download URL; /mobile URL will be deprecated
Scott Main [Tue, 28 May 2013 18:49:25 +0000 (11:49 -0700)]
am
5bd67944: am
5fbe17fe: am
27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '
5bd6794468df7f7900f1e0a37c24653dd524a5c8':
update eclipse download URL; /mobile URL will be deprecated
Scott Main [Tue, 28 May 2013 18:45:25 +0000 (11:45 -0700)]
am
5fbe17fe: am
27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '
5fbe17fe2a5804a613c3e9d72d555a0aae8ba618':
update eclipse download URL; /mobile URL will be deprecated
Scott Main [Tue, 28 May 2013 18:43:50 +0000 (11:43 -0700)]
am
27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
* commit '
27ab718e7ca00092acab7f55fed1a5dea9a7a77b':
update eclipse download URL; /mobile URL will be deprecated
Scott Main [Tue, 28 May 2013 18:41:37 +0000 (18:41 +0000)]
Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev
John Spurlock [Tue, 21 May 2013 21:19:53 +0000 (17:19 -0400)]
Hideybars feature confirmation toast bar.
Enhance Toast to support new standard toast bar style, similar
to the undo bar in Gmail. Toast bars can be interactive,
and can have a single action. Add a new toast duration to
indicate persistent toasts (no auto-hide delay).
Use the new toast bar to implement a feature hint when hiding
the navigation bar in hideybars mode.
Per UX, the feature confirmation bar can also be dismissed on
any outside touch as long as the user confirmed it using the
OK button at least once globally.
Bug:
8754108
Change-Id: Iaa85d3b4da7ada1952a562f1e31de04380f5d587
John Spurlock [Tue, 28 May 2013 16:36:19 +0000 (09:36 -0700)]
am
ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
* commit '
ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
Fix typo in View.java javadocs
John Spurlock [Tue, 28 May 2013 16:33:49 +0000 (16:33 +0000)]
Merge "Fix typo in View.java javadocs" into jb-mr2-dev
Scott Main [Tue, 28 May 2013 16:08:02 +0000 (09:08 -0700)]
am
0e11e8ef: am
6e5ee7dd: am
ea325978: am
005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '
0e11e8ef4bb6472b8e8a1b4b76b4b7c195aaffe1':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 16:03:37 +0000 (09:03 -0700)]
am
6e5ee7dd: am
ea325978: am
005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '
6e5ee7ddf2cc948ef3b69a73f25ce81f7edd76e9':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 16:01:10 +0000 (09:01 -0700)]
am
597a8374: am
afaff6e2: am
fb22f9cb: am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
597a8374491ffb9dc5c07fadfccd9c1b1b336046':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 16:00:51 +0000 (09:00 -0700)]
am
ea325978: am
005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '
ea32597832aada5f811c9ca1c1baf008d62ab64a':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 15:59:09 +0000 (08:59 -0700)]
am
afaff6e2: am
fb22f9cb: am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
afaff6e2e90e61df52737fec9e059b05cfa71e48':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 15:58:18 +0000 (08:58 -0700)]
am
005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '
005d2afb308f474352ec4b504cf661851e4c2e59':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 15:57:27 +0000 (08:57 -0700)]
am
fb22f9cb: am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 15:56:23 +0000 (15:56 +0000)]
Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:54:59 +0000 (08:54 -0700)]
am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
5d64a1932d6c94628442b811c4be7bc41f0f1a8f':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 15:53:04 +0000 (15:53 +0000)]
Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
John Spurlock [Tue, 28 May 2013 15:45:18 +0000 (15:45 +0000)]
Merge "Fix typo in View.java javadocs"
Scott Main [Tue, 28 May 2013 15:44:23 +0000 (08:44 -0700)]
am
0b92682d: am
43fa2b88: am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
0b92682d292acd830ac84467178ff417cbb3e699':
new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:42:24 +0000 (08:42 -0700)]
am
43fa2b88: am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
new android studio download v0.1.1
John Spurlock [Tue, 28 May 2013 15:40:58 +0000 (11:40 -0400)]
Fix typo in View.java javadocs
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
Scott Main [Tue, 28 May 2013 15:39:42 +0000 (08:39 -0700)]
am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
718011ac851dcd8925ebeaf4f5516b7b1b62a647':
new android studio download v0.1.1
Craig Mautner [Tue, 28 May 2013 15:39:25 +0000 (08:39 -0700)]
Replace mFocusedStack with getFocusedStack()
mFocusedStack should not be used directly as it may be null. Added
a note to the declaration to remind future self of that.
Fixes bug
9165949.
Change-Id: I8fad428d93b50909be9e7ec51df81149c11313b3
Scott Main [Tue, 28 May 2013 15:37:35 +0000 (08:37 -0700)]
am
d4b710c6: new android studio download v0.1.1
* commit '
d4b710c69800acd0a9237a64e73d62ac9ba3a517':
new android studio download v0.1.1
The Android Open Source Project [Tue, 28 May 2013 14:37:29 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
John Spurlock [Tue, 28 May 2013 13:44:50 +0000 (09:44 -0400)]
Fix typo in View.java javadocs
Change-Id: I6da88e18fe32c4763c916990f6aa17dda21f5c8f
Matthew Xie [Sun, 26 May 2013 21:40:14 +0000 (14:40 -0700)]
am
27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '
27e453617a2c179580a55d6cbe0619fa95adf693':
Revert "Change GATT_FAILURE from 0 to 0x101"
Matthew Xie [Sun, 26 May 2013 21:38:01 +0000 (21:38 +0000)]
Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
Matthew Xie [Sun, 26 May 2013 21:03:16 +0000 (21:03 +0000)]
Revert "Change GATT_FAILURE from 0 to 0x101"
This reverts commit
8310e6196ffeb6d0dce33fc1a528113b04f304d6
Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
Matthew Xie [Sun, 26 May 2013 20:21:44 +0000 (13:21 -0700)]
am
413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '
413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
Change GATT_FAILURE from 0 to 0x101
Matthew Xie [Sun, 26 May 2013 20:19:05 +0000 (20:19 +0000)]
Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
The Android Automerger [Sun, 26 May 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Dianne Hackborn [Sun, 26 May 2013 07:25:11 +0000 (00:25 -0700)]
am
840f1143: am
7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '
840f114395652b3d31815ae23302218305b8b780':
Fix wrong log information in DevicePolicyManagerService
Dianne Hackborn [Sun, 26 May 2013 07:23:28 +0000 (00:23 -0700)]
am
7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '
7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
Fix wrong log information in DevicePolicyManagerService
Dianne Hackborn [Sun, 26 May 2013 07:22:21 +0000 (07:22 +0000)]
Merge "Fix wrong log information in DevicePolicyManagerService"
Dianne Hackborn [Sun, 26 May 2013 07:05:08 +0000 (00:05 -0700)]
am
43861f9d: am
f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '
43861f9de965593340f6a63c270120a7f1a8701c':
Avoid IllegalArgumentException in Preference.java compareTo()
Dianne Hackborn [Sun, 26 May 2013 07:05:05 +0000 (00:05 -0700)]
am
95b79966: am
0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '
95b79966934864f1e81329de92562ee387ff5700':
Fix CalendarView to show the month title properly.
Dianne Hackborn [Sun, 26 May 2013 07:05:02 +0000 (00:05 -0700)]
am
c7322005: am
f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit '
c73220050efa7420974850ee9a80a965d807c7ce':
Don't include flags in configuration change if their value hasn't changed.
Dianne Hackborn [Sun, 26 May 2013 07:04:59 +0000 (00:04 -0700)]
am
fc09b326: am
fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '
fc09b326da5e35786530777f01cd132d7686a788':
Fix documentation of requestCode parameter.
Dianne Hackborn [Sun, 26 May 2013 07:04:57 +0000 (00:04 -0700)]
am
087384b0: am
f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit '
087384b0af6fd3912a3d3e32b9ade7e4604e6537':
Framework/base: Added synchronization block to avoid race condition
Dianne Hackborn [Sun, 26 May 2013 07:02:46 +0000 (00:02 -0700)]
am
f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
* commit '
f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
Avoid IllegalArgumentException in Preference.java compareTo()
Dianne Hackborn [Sun, 26 May 2013 07:02:41 +0000 (00:02 -0700)]
am
0a40bef9: Merge "Fix CalendarView to show the month title properly."
* commit '
0a40bef955c937189841b6f1695e8001311758fa':
Fix CalendarView to show the month title properly.
Dianne Hackborn [Sun, 26 May 2013 07:02:37 +0000 (00:02 -0700)]
am
f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit '
f9b41efe17718a21df115d95c47a94d97a767076':
Don't include flags in configuration change if their value hasn't changed.
Dianne Hackborn [Sun, 26 May 2013 07:02:31 +0000 (00:02 -0700)]
am
fee6d0cb: Merge "Fix documentation of requestCode parameter."
* commit '
fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
Fix documentation of requestCode parameter.
Dianne Hackborn [Sun, 26 May 2013 07:02:24 +0000 (00:02 -0700)]
am
f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit '
f325103356c559d6378da7fb7db3b2a49aba5d13':
Framework/base: Added synchronization block to avoid race condition
Dianne Hackborn [Sun, 26 May 2013 06:59:29 +0000 (06:59 +0000)]
Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
Dianne Hackborn [Sun, 26 May 2013 06:58:14 +0000 (06:58 +0000)]
Merge "Fix CalendarView to show the month title properly."
Dianne Hackborn [Sun, 26 May 2013 06:57:04 +0000 (06:57 +0000)]
Merge "Don't include flags in configuration change if their value hasn't changed."
Dianne Hackborn [Sun, 26 May 2013 06:56:03 +0000 (06:56 +0000)]
Merge "Fix documentation of requestCode parameter."
Dianne Hackborn [Sun, 26 May 2013 06:30:26 +0000 (06:30 +0000)]
Merge "Framework/base: Added synchronization block to avoid race condition"
Yu Shan Emily Lau [Sat, 25 May 2013 01:55:55 +0000 (18:55 -0700)]
am
03367e29: am
b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev
* commit '
03367e2971e095b819f789c999cf03f8b3eec7ae':
Update test with CamercorderProfile video size.
Yu Shan Emily Lau [Sat, 25 May 2013 01:53:47 +0000 (18:53 -0700)]
am
b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev
* commit '
b830d527deb75a36aa78367026d6631a9b4e1126':
Update test with CamercorderProfile video size.
Yu Shan Emily Lau [Sat, 25 May 2013 01:51:40 +0000 (01:51 +0000)]
Merge "Update test with CamercorderProfile video size." into jb-mr2-dev
Scott Main [Sat, 25 May 2013 01:20:41 +0000 (18:20 -0700)]
am
79c53809: am
4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
* commit '
79c538094b99330bd2af37d1f486220643b27e42':
add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
Scott Main [Sat, 25 May 2013 01:18:33 +0000 (18:18 -0700)]
am
4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
* commit '
4a47f17a9db8fd2b8b17ad10a629216cc3c6333c':
add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
Scott Main [Sat, 25 May 2013 01:17:06 +0000 (01:17 +0000)]
Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev
Romain Guy [Sat, 25 May 2013 00:42:41 +0000 (17:42 -0700)]
am
ac629ee8: am
529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #
9057757" into jb-mr2-dev
* commit '
ac629ee86d9e60e35098d8e731a35fc36b3bf3d5':
TransitionDrawable should not become a LayerDrawable Bug #
9057757
Romain Guy [Sat, 25 May 2013 00:40:40 +0000 (17:40 -0700)]
am
529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #
9057757" into jb-mr2-dev
* commit '
529a9e391e386aac37ea722d2517d376968b3d31':
TransitionDrawable should not become a LayerDrawable Bug #
9057757
Romain Guy [Sat, 25 May 2013 00:38:26 +0000 (00:38 +0000)]
Merge "TransitionDrawable should not become a LayerDrawable Bug #
9057757" into jb-mr2-dev
Romain Guy [Sat, 25 May 2013 00:31:17 +0000 (17:31 -0700)]
TransitionDrawable should not become a LayerDrawable
Bug #
9057757
Calling TransitionDrawable.mutate() would turn it into a LayerDrawable,
causing it to draw all its children on screen at the same time.
Change-Id: I5efa87c43114a9c817719f08890ce41965f3220a
Dianne Hackborn [Fri, 24 May 2013 23:37:16 +0000 (23:37 +0000)]
Merge "New ArrayMap class."
Dianne Hackborn [Tue, 21 May 2013 01:42:16 +0000 (18:42 -0700)]
New ArrayMap class.
This is a new kind of key/value mapping that stores its data
as an array, so it doesn't need to create an extra Entry object
for every mapping placed in to it. It is also optimized to reduce
memory overhead in other ways, by keeping the base object small,
being fairly aggressive about keeping the array data structures
small, etc.
There are some unit and performance tests dropped in to some
random places; they will need to be put somewhere else once I
decided what we are going to do with this for the next release
(for example if we make it public the unit tests should go in
to CTS).
Switch IntentResolver to using ArrayMap instead of HashMap.
Also get rid of a bunch of duplicate implementations of binarySearch,
and add an optimization to the various sparse arrays where you can
supply an explicit 0 capacity to prevent it from doing an initial
array allocation; use this new optimization in a few places where it
makes sense.
Change-Id: I01ef2764680f8ae49938e2a2ed40dc01606a056b
Romain Guy [Fri, 24 May 2013 23:22:03 +0000 (23:22 +0000)]
Merge "Make sure atlas antries can correctly filter/wrap textures"
Romain Guy [Fri, 24 May 2013 23:19:19 +0000 (16:19 -0700)]
Make sure atlas antries can correctly filter/wrap textures
The virtual textures would each have their own values for wrapping
and filtering which could lead to conflict and/or extraneous GL
commands being issued.
Change-Id: I64cb59a03e598f46bf645bd1d30fccfa63a07431
Craig Mautner [Fri, 24 May 2013 23:14:52 +0000 (23:14 +0000)]
Merge "Convert API refs to StackBox from ActivityStack."
Craig Mautner [Fri, 24 May 2013 22:49:29 +0000 (15:49 -0700)]
Convert API refs to StackBox from ActivityStack.
- Removed IActivityManager.getStacks() since getStackBoxes() is better.
- Made createStacks operate relative to StackBox instead of TaskStack.
- Made resizeStack into resizeStackBox.
Change-Id: I7a0e1f4e34f399b4fd1180c60cc3989f9c2433f3
The Android Open Source Project [Fri, 24 May 2013 22:30:19 +0000 (15:30 -0700)]
am
d607b9c7: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d607b9c725d8a080842e5969b2d6001249ad88cd':
Use the old interface when resetting connections
Fix account filtering for specific package name
The Android Open Source Project [Fri, 24 May 2013 22:28:19 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917