drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,698 Commits 1 Branch 0 Tags
Commit Graph

244698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fionaxu
1e8fe12f4e resolve merge conflicts of 2c53526 to lmp-mr1-dev 
am: c196526f8e

Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9
 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  -s ours

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816
 2016-06-08 02:04:12 +00:00
fionaxu
84f479f6b5 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 
am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
 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 93d828de59986a990bfd2fffcfc399deae5ba6ba.

Change-Id: Iaa10c63b48dd434badc3f6d2c23859391996abac
 2016-06-08 01:52:50 +00:00
fionaxu
07c994012c DO NOT MERGE fix build breakage on k 
am: 4e33c4f8b1

Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
 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 2a7e4442bf9892842e0fc7eba9296e8fcf9f8ea5.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
 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
Baligh Uddin
a2e9249983 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I717395f19e8605b4ad4af00b8601ff59c3acb73c
 2016-06-07 17:02:34 -07:00
Julia Reynolds
9eb2c1e85c Handle alarm firing outside of DND period. 
Change-Id: Ib8bb878709ab8b5db8aba7f31e239e44409e18d4
Fixes: 28459870
 2016-06-07 19:58:38 -04:00
Felipe Leme
29de4922db Duplicate file descriptor when dumping asynchronously. 
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
 2016-06-07 16:35:50 -07:00
fionaxu
2c53526b4b Backport loadSafeLabel changes am: be2865a60a am: 4c50846519 
am: 9a825b0fd5

Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8
 2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5 Backport loadSafeLabel changes am: be2865a60a 
am: 4c50846519

Change-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4
 2016-06-07 23:20:04 +00:00
fionaxu
4c50846519 Backport loadSafeLabel changes 
am: be2865a60a

Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126
 2016-06-07 23:13:08 +00:00
Andreas Gampe
ce78b9e114 Frameworks/base: Fix FastPrintWriter infinite loop 
Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
 2016-06-07 16:02:23 -07:00
David Sehr
a85c1e8e69 Merge "Add usage line for dump-profiles" into nyc-dev 2016-06-07 23:01:10 +00:00
Chong Zhang
92ab103cb6 Set fontScale in override config to be equal to global. 
The default fontScale in EMPTY config is 1.0. This will result in
updateFrom always overriding the fontScale to 1.0 since it's non-zero.

We can't set it to 0.0 either as that will make the override config
not equal to EMPTY. The rest of the code doesn't work well with that.

So here we always set the override fontScale to be idential to global.

bug: 29113700
Change-Id: I1dbe507145b8190a9ae5e108948c833d4e037e1d
 2016-06-07 15:56:53 -07:00
Dirk Dougherty
f91783c8a5 Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f 
am: f5c85abac6

Change-Id: I2ea6f9370725235b9d63f6c5a843e42b09361315
 2016-06-07 22:53:20 +00:00
fionaxu
be2865a60a Backport loadSafeLabel changes 
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
 2016-06-07 22:51:28 +00:00
Dirk Dougherty
f5c85abac6 Minor fixes to distribute cards and fab. am: 5ec3a404fb 
am: ba9c3d585f

Change-Id: I6f250c2b9733562e388e2cd81ab9b7c365bb3c9a
 2016-06-07 22:48:17 +00:00
Dirk Dougherty
ba9c3d585f Minor fixes to distribute cards and fab. 
am: 5ec3a404fb

Change-Id: I47c10ecd60b616bd0f343cb2309820c800d5a077
 2016-06-07 22:45:30 +00:00
Dirk Dougherty
5ec3a404fb Minor fixes to distribute cards and fab. 
Change-Id: I125162be9d53faef0c477a2e2592624bb5869ff4
 2016-06-07 15:39:03 -07:00
Eric Schmidt
d0ef8a0147 docs: Added CL commands for data-saver testing am: b603eae9b3 
am: 2d05938af9

* commit '2d05938af9e572ca9582552ad966c18b7b83e94f':
  docs: Added CL commands for data-saver testing

Change-Id: Ic0f9a82f05dc32b162013df51c155f2a1a206c45
 2016-06-07 21:52:54 +00:00
Eric Schmidt
2d05938af9 docs: Added CL commands for data-saver testing 
am: b603eae9b3

* commit 'b603eae9b363ca292d721243819dfd701a194b65':
  docs: Added CL commands for data-saver testing

Change-Id: I1f5bf236f72db694ddedfe6552f188242d5f61a1
 2016-06-07 21:47:47 +00:00