Romain Guy
80b12fcaae
Disable the AssetAtlas when running under valgrind
...
Bug #9191438
When running under valgrind, the ppid will be different from the ppid
of the system server (which always gets forked from zygote.)
Change-Id: I42cbf99fd0084aeab76c30de9beb7c49ed1fc7d8
2013-05-29 16:01:36 -07:00
Matthew Xie
16a90db8d7
am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
...
* commit '897d98a7530109bff8d73b3651d8884c76f54c42':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
2013-05-28 22:30:10 -07:00
Matthew Xie
897d98a753
am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
...
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
2013-05-28 22:27:44 -07:00
Matthew Xie
6ea0636a9c
Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
2013-05-29 05:25:47 +00:00
Baligh Uddin
e3425ac426
am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'af1e512e3f2b52e563e37c1635cbea06e87e0592':
Import translations. DO NOT MERGE
2013-05-28 20:44:52 -07:00
Baligh Uddin
b3db126dd4
Merge "Import translations. DO NOT MERGE"
2013-05-29 03:43:49 +00:00
Baligh Uddin
af1e512e3f
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-29 03:42:23 +00:00
Dianne Hackborn
21d9b56692
Add more details about why a force stop is happening.
...
Change-Id: Ia938cf6fc37ad22fc7447dc538968c7bd234be7d
2013-05-28 17:46:59 -07:00
Jeff Brown
19c618dbce
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
2013-05-28 15:52:22 -07:00
Jeff Brown
c8a7773562
am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list"
...
* commit 'dea6e86dce716b67fe92c9b281fe9e79256f3b78':
Bug fix for building the hover target list
2013-05-28 15:49:13 -07:00
Jeff Brown
dea6e86dce
am 3422ceb6: Merge "Bug fix for building the hover target list"
...
* commit '3422ceb6ba453c28ac39dfce34534e0346394a3a':
Bug fix for building the hover target list
2013-05-28 15:46:00 -07:00
Matthew Xie
90ca807f7b
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
...
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
2013-05-28 15:28:24 -07:00
John Spurlock
883ffa243d
Merge "Hideybars feature confirmation toast bar."
2013-05-28 22:23:17 +00:00
Chris Craik
1728bebe9a
Merge "Support larger bitmaps in BitmapFactory.Options.inBitmap"
2013-05-28 21:31:54 +00:00
Jeff Brown
be16567567
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
2013-05-28 13:51:01 -07:00
Chris Craik
9f58361e98
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
2013-05-28 13:50:33 -07:00
Matthew Xie
67cc127186
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"
2013-05-28 13:50:13 -07:00
Matthew Xie
d78afea78d
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
2013-05-28 13:50:09 -07:00
Dianne Hackborn
aa508bc6db
am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
...
* commit '23b07d5549bf38cfea388b439ac519670be6e7e2':
Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-28 13:50:02 -07:00
Dianne Hackborn
bbf6ecc981
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.
2013-05-28 13:49:59 -07:00
Dianne Hackborn
f8b8521598
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.
2013-05-28 13:49:56 -07:00
Dianne Hackborn
56798adf41
am 959b9b39: am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."
...
* commit '959b9b39b4e488b643919fb7a58f2fbbdd70e573':
Fix documentation of requestCode parameter.
2013-05-28 13:49:53 -07:00
Jeff Brown
3422ceb6ba
Merge "Bug fix for building the hover target list"
2013-05-28 20:04:23 +00:00
Jeff Brown
dcb8d87658
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
2013-05-28 13:00:28 -07:00
Jeff Brown
79df1e6545
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
2013-05-28 12:57:59 -07:00
Jeff Brown
e2a281ca85
Merge "Add additional Method that check whether a table is empty or not"
2013-05-28 19:55:26 +00:00
John Spurlock
dcf4f21460
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
2013-05-28 13:09:23 -04:00
John Spurlock
be7a7e546f
am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
...
* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
Fix typo in View.java javadocs
2013-05-28 09:36:19 -07:00
John Spurlock
0efd4f0215
Merge "Fix typo in View.java javadocs"
2013-05-28 15:45:18 +00:00
John Spurlock
44b1edd948
Fix typo in View.java javadocs
...
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
2013-05-28 11:40:58 -04:00
John Spurlock
9643d40395
Fix typo in View.java javadocs
...
Change-Id: I6da88e18fe32c4763c916990f6aa17dda21f5c8f
2013-05-28 09:44:50 -04:00
Baligh Uddin
1f12ff9b0e
Import translations. DO NOT MERGE
...
Change-Id: I258b08e31327bb4b99088338f81217db5ec2d0fb
Auto-generated-cl: translation import
2013-05-27 10:08:03 -07:00
Baligh Uddin
451b69eee5
Import translations. DO NOT MERGE
...
Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import
2013-05-27 09:55:15 -07:00
Matthew Xie
e7e6bf9f02
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"
2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a
Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15
Revert "Change GATT_FAILURE from 0 to 0x101"
...
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6
Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc
am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
...
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
Change GATT_FAILURE from 0 to 0x101
2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300
Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
2013-05-26 20:19:06 +00:00
Dianne Hackborn
23b07d5549
am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
...
* commit '43861f9de965593340f6a63c270120a7f1a8701c':
Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-26 00:05:08 -07:00
Dianne Hackborn
4e73e8a817
am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
...
* commit '95b79966934864f1e81329de92562ee387ff5700':
Fix CalendarView to show the month title properly.
2013-05-26 00:05:05 -07:00
Dianne Hackborn
89eed12559
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.
2013-05-26 00:05:02 -07:00
Dianne Hackborn
959b9b39b4
am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."
...
* commit 'fc09b326da5e35786530777f01cd132d7686a788':
Fix documentation of requestCode parameter.
2013-05-26 00:04:59 -07:00
Dianne Hackborn
43861f9de9
am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
...
* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-26 00:02:46 -07:00
Dianne Hackborn
95b7996693
am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
...
* commit '0a40bef955c937189841b6f1695e8001311758fa':
Fix CalendarView to show the month title properly.
2013-05-26 00:02:41 -07:00
Dianne Hackborn
c73220050e
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.
2013-05-26 00:02:37 -07:00
Dianne Hackborn
fc09b326da
am fee6d0cb: Merge "Fix documentation of requestCode parameter."
...
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
Fix documentation of requestCode parameter.
2013-05-26 00:02:31 -07:00
Dianne Hackborn
f46449abed
Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955
Merge "Fix CalendarView to show the month title properly."
2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17
Merge "Don't include flags in configuration change if their value hasn't changed."
2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e
Merge "Fix documentation of requestCode parameter."
2013-05-26 06:56:03 +00:00