Julia Reynolds
e1451c4e30
Merge "Handle alarm firing outside of DND period." into nyc-dev
2016-06-08 18:19:13 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
Aurimas Liutikas
56334c5202
Correct the size of example bitmap for xxhdpi.
...
Bug:
https://code.google.com/p/android/issues/detail?id=156314
Change-Id: Ib95efa2767aa52cb2e11195499828ca41e58eb50
(cherry picked from commit 8c719cece6
2016-06-08 18:06:29 +00:00
Aurimas Liutikas
b7c41c89a2
Remove duplicate the from AppBar documentation.
...
Bug:
https://code.google.com/p/android/issues/detail?id=187156
Change-Id: I5ee5e93b5e5b004f49e860047e4e2610b44e81d9
(cherry picked from commit bfc3cfdec5
2016-06-08 18:06:01 +00:00
Aurimas Liutikas
29c15361f8
Fix code example in testing-support-library.
...
Note: mDevice is a variable, there is additional brackets.
Bug:
https://code.google.com/p/android/issues/detail?id=206043
Change-Id: I8e88a6144f1ede1d45262ff034159de524c24b70
(cherry picked from commit 6b1853008e
2016-06-08 18:05:49 +00:00
Aurimas Liutikas
2e874fe28c
Fix a link to CustomTabsCallback in support-library docs.
...
Bug:
https://code.google.com/p/android/issues/detail?id=183077
Change-Id: I86d1d8e07e42e9e295364b002e7e1534d4d9d5cc
(cherry picked from commit f82032fcf9
2016-06-08 18:05:33 +00:00
TreeHugger Robot
fb5995cfbb
Merge "Wrap closeQuietly() on finally block." into nyc-dev
2016-06-08 17:59:48 +00:00
Amith Yamasani
718f321369
Merge "Add a separate read permission for oem unlock state" into nyc-dev
2016-06-08 17:55:41 +00:00
Tianjie Xu
00681d0e78
Merge "Change unit of I/O statistics to MiB" into nyc-dev
2016-06-08 17:25:16 +00:00
fionaxu
2d03c0f956
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7
...
am: 16dfcd7950
2016-06-08 17:23:33 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
fionaxu
16dfcd7950
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e
...
am: eb53629bf7
2016-06-08 17:15:39 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
eb53629bf7
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours
...
am: 0e64d7411e
2016-06-08 17:10:02 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +00:00
fionaxu
0e64d7411e
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours
...
am: e1ca4cd074
2016-06-08 16:58:26 +00:00
fionaxu
1e8fe12f4e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
am: c196526f8e
2016-06-08 16:58:13 +00:00
Dan Yu
22dec763a3
Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev
2016-06-08 16:22:27 +00:00
Felipe Leme
c74972f891
Wrap closeQuietly() on finally block.
...
BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
2016-06-08 09:12:37 -07:00
Alan Viverette
4b2b615669
Return correct default theme on API >= 24
...
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.
Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
2016-06-08 11:45:15 -04:00
Ricky Wai
18c8690b7e
Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev
2016-06-08 14:33:56 +00:00
TreeHugger Robot
464f7e4983
Merge "Fix #29073394 : Need to bind to scorer after user is unlocked." into nyc-dev
2016-06-08 14:32:43 +00:00
Baligh Uddin
002ccec5c1
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:09:25 +00:00
Jason Monk
fcad09a777
Settings: Better handling for disabled tiles
...
Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.
Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209
2016-06-08 09:09:06 -04:00
Baligh Uddin
e573989e05
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:47 +00:00
Baligh Uddin
c20ea2eb43
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:43 +00:00
Baligh Uddin
64d6fddc4b
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:40 +00:00
Baligh Uddin
2d3c74a2fd
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:37 +00:00
Jason Monk
9ffd9f61d3
QS: Fix leak in QSAnimator
...
Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes: 29113833
2016-06-08 09:05:08 -04:00
TreeHugger Robot
ee5e4cc836
Merge "Package changed/removed listeners for always-on VPN" into nyc-dev
2016-06-08 10:46:42 +00:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
Baligh Uddin
460b95639e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21
2016-06-07 20:49:52 -07:00
Phil Weaver
fc71309640
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev
2016-06-08 02:19:34 +00:00
fionaxu
e1ca4cd074
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c
...
am: 84f479f6b5
2016-06-08 02:04:12 +00:00
fionaxu
84f479f6b5
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1
...
am: 07c994012c
2016-06-08 01:59:04 +00:00
Jim Miller
3d5e396583
Revert "Temporarily increase timeout for devices with buggy driver"
...
Bug 28201240 has been fixed, reverting workaround
This reverts commit 93d828de59
2016-06-08 01:52:50 +00:00
fionaxu
07c994012c
DO NOT MERGE fix build breakage on k
...
am: 4e33c4f8b1
2016-06-08 01:49:39 +00:00
Chong Zhang
94b4029f03
Merge "Check if task was top of stack before it's removed" into nyc-dev
2016-06-08 01:18:01 +00:00
Chong Zhang
723e5afa9e
Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev
2016-06-08 01:12:27 +00:00
TreeHugger Robot
c02ba17898
Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev
2016-06-08 01:08:42 +00:00
Baligh Uddin
1696f811f4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ieac4df1080a37509c12c420f15e64063e9c15fc4
2016-06-07 18:03:04 -07:00
Chong Zhang
c9adac6abb
Merge "Set fontScale in override config to be equal to global." into nyc-dev
2016-06-08 00:59:44 +00:00
fionaxu
4e33c4f8b1
DO NOT MERGE fix build breakage on k
...
Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
2016-06-07 17:55:27 -07:00
Tianjie Xu
a2fe5517bc
Change unit of I/O statistics to MiB
...
I/O in bytes are too large and it may cause overflow. Moreover, data with
large numbers are grouped in the same bucket of the histogram. This adds
difficulty to the analysis. Changing unit of I/O to MiB so that we can
have a better data distribution.
Bug: 28658632
Change-Id: Id9913d71e62b36ce5d5d2e57676953f4dbd0c7c9
2016-06-07 17:54:48 -07:00
Siyamed Sinir
96c3e5504b
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
2016-06-08 00:46:28 +00:00
TreeHugger Robot
c82a2b5358
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
2016-06-08 00:39:00 +00:00
Phil Weaver
266ed9acc3
Revert "Improve accessibility window title behavior"
...
Bug: 29127065
This reverts commit 2a7e4442bf
2016-06-08 00:34:40 +00:00
Baligh Uddin
2d40d2c619
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: I3d2586f7265f533c4b1620349c1a52851b4586e0
2016-06-07 17:32:37 -07:00
TreeHugger Robot
4401e24add
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:31 +00:00
Baligh Uddin
471718a57f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Icab456e7a193fc6099bbd6e7ff207d542e98830e
2016-06-07 17:16:36 -07:00
