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

219977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryce Lee
38f0119b09 am adf38ccb: am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 
* commit 'adf38ccb6ea0a3b406273061d1fc01f61bc6abb6':
  Add capability to identify phone accounts that are emergency only.
 2015-10-16 22:42:43 +00:00
Matthew Williams
3273e045ad am 4b4ac110: (-s ours) am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit '4b4ac1103e0fb54956425f81fda8c6b2893a6c59':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:42:31 +00:00
Ben Kwa
8250db41cb Add shift-selection to DocumentsUI. 
- Move the key listener from BaseActivity into DirectoryFragment, where it
belongs.
- Add code to detect the shift key during keyboard navigation, and
extend the selection in that case.

BUG=20859059

Change-Id: Ia7d3c7d4343f0185873deeaf1a35028a716b6e19
 2015-10-16 15:41:59 -07:00
Wale Ogunwale
64776ef01f Merge "Revert "Dont update thumbnails of freeform windows on focus change"" 2015-10-16 22:38:13 +00:00
Bryce Lee
adf38ccb6e am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 
* commit 'b70426b197c373ccd8ab46c080fedf66e43d52e3':
  Add capability to identify phone accounts that are emergency only.
 2015-10-16 22:33:23 +00:00
Matthew Williams
4b4ac1103e am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit 'c85315acdf028d09b178e2c9a6ec66374652894a':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:33:17 +00:00
Bryce Lee
b70426b197 am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 
* commit '4c9fcd5412a190c6e73f25346cf13c67286fa01e':
  Add capability to identify phone accounts that are emergency only.
 2015-10-16 22:29:32 +00:00
Matthew Williams
c85315acdf am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit '9a365194861e78dd5edbebf292aaa7e48804ab46':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:29:26 +00:00
George Mount
2d17f8643b Merge "Change wrong doc about using linear interpolator." 2015-10-16 22:27:48 +00:00
Bryce Lee
4c9fcd5412 Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 2015-10-16 22:26:48 +00:00
Matthew Williams
9a36519486 am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit '1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:25:12 +00:00
Roozbeh Pournader
ca9dbf596d am ebdf60e7: am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit 'ebdf60e7c800b2ccda01887a304ddc0edce0361d':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:20:01 +00:00
Roozbeh Pournader
ebdf60e7c8 am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:12:46 +00:00
Roozbeh Pournader
0221328c33 am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit 'b3538082d78284165ff0dbe5a04992afe2018d0b':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:06:21 +00:00
Roozbeh Pournader
b3538082d7 am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit '5362f273e91885041b7cb246667cff3ceca74703':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:01:49 +00:00
Matthew Williams
1f0ec16b6d DO NOT MERGE Sanity check loaded periodics and cap runtime. 
BUG: 24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.

Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
(cherry picked from commit fa8e5084eed63ab8d92c71fcff656690a30293c3)
 2015-10-16 21:56:55 +00:00
Matthew Williams
072c5bdff7 Merge "Sanity check loaded periodics and cap runtime." 2015-10-16 21:56:10 +00:00
Roozbeh Pournader
5362f273e9 Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 2015-10-16 21:54:12 +00:00
Chris Wren
f885276e6f update metrics enums 
Change-Id: I5c4b20dc514889493e3049b4242876633ebebcde
 2015-10-16 17:41:13 -04:00
Adrian Roos
5419280fb3 am 2de89ae8: am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '2de89ae843a0a6b492eaa55f96a641df16b718a8':
  Fix wrongly laid out navigation color view
 2015-10-16 21:19:03 +00:00
Wale Ogunwale
645e8a9ae8 Merge "Added support for resizing background color for an app window" 2015-10-16 21:14:06 +00:00
Adrian Roos
2de89ae843 am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '3c439c720d460266358c10d8d2eea9ef9e79beb0':
  Fix wrongly laid out navigation color view
 2015-10-16 21:12:06 +00:00
Adrian Roos
3c439c720d am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
  Fix wrongly laid out navigation color view
 2015-10-16 20:54:40 +00:00
Adrian Roos
85fae34e81 am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view
 2015-10-16 20:49:59 +00:00
Adrian Roos
70ea857859 Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 2015-10-16 20:43:32 +00:00
Svetoslav
ffb32b1f24 Don't allow concurrent permission requests. 
bug:24690277

Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
 2015-10-16 13:42:32 -07:00
Julia Reynolds
74303cfe2b Add Notification topics. 
Topics are tags that developers can add to group notifications
by theme. Users will be able to block notifications by topic.

Bug: 22451710
Change-Id: I5b4677da66b21933f479f5e56c18ca563810b43b
 2015-10-16 16:38:45 -04:00
Toni Barzic
17fdb13a60 Reset lock pattern stealth mode when keygueard pattern view is reset 
Stealth mode is not guaranteed to remain constant through keyguard pattern
view lifetime (it's user specific, and user context may be switched), so
update it when keyguard pattern is reset.

BUG=25017442

Change-Id: I798fe685cfaadd35462f54ab7e4fa9e6f6276436
 2015-10-16 13:38:11 -07:00
Julia Reynolds
52815c3bb4 Merge "resolved conflicts for 429e7dcd to master" 2015-10-16 20:37:46 +00:00
George Mount
97339f196f Merge "Fix documentation for setTransition to include fade." 2015-10-16 20:34:22 +00:00
Chris Wren
063926bda7 count notification peeks by window action 
Bug: 20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335
 2015-10-16 16:26:41 -04:00
Julia Reynolds
c72c931eb8 resolved conflicts for 429e7dcd to master 
Change-Id: Id0aca75915a054253d032d333defba1a38b80abe
 2015-10-16 16:25:40 -04:00
Matthew Williams
560bd7c743 am 333d7e0b: (-s ours) am 6331753e: am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit '333d7e0bce5bb34de0fe9060290891d7d99b7f38':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 20:19:42 +00:00
Matthew Williams
fa8e5084ee Sanity check loaded periodics and cap runtime. 
BUG: 24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.

Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
 2015-10-16 13:07:22 -07:00
Alexander Levitskiy
0d677791d3 Merge "meminfo: Change size suffix to comply with iec, make it parseable with numfmt." 2015-10-16 20:04:49 +00:00
Julia Reynolds
429e7dcd09 am 542052dd: am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit '542052dd83e89f7cebc07aa0004a8592efc12364':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:55:25 +00:00
Wale Ogunwale
f3a62fbc58 Added support for resizing background color for an app window 
R.styleable.Window_windowResizingBackground allows an activity to
specify the background drawable that should be used when it is being
resized in multi-window mode. If unset, the system will try to use
R.styleable.Window_windowBackground if set, then
R.styleable.Window_windowBackgroundFallback if set. Otherwise, the
system default resizing background color set by
R.integer.config_windowResizingBackgroundColorARGB.

Also, use decor title color as caption background color when resizing
instead of black.

Bug: 24534744
Change-Id: I83313865b4044b976ebc78d598e14e17e0f37212
 2015-10-16 12:54:31 -07:00
Julia Reynolds
542052dd83 am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit '96faf5c8fad5114dda807eee1c94a1c0dc021fe8':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:48:47 +00:00
Julia Reynolds
96faf5c8fa am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit 'a762c210d2901bedce5b7972eb139c4d5e59dcd1':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:41:54 +00:00
Matthew Williams
333d7e0bce am 6331753e: am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit '6331753e3ba9d6c66c562836f28f3b6e1e178ecd':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 19:39:23 +00:00
Julia Reynolds
a762c210d2 Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev 2015-10-16 19:38:22 +00:00
George Mount
27b3ae6126 Fix documentation for setTransition to include fade. 
Bug 25016696

Also add annotations for FragmentTransaction methods.

Change-Id: If3d1427d83dd7c399609bf8fd9a54467224d3a35
 2015-10-16 12:36:58 -07:00
Adam Lesinski
1f809f7a46 Merge "AAPT2: Separate out the various steps" 2015-10-16 19:16:32 +00:00
Adam Lesinski
1ab598f46c AAPT2: Separate out the various steps 
An early refactor. Some ideas became clearer as
development continued. Now the various phases are much
clearer and more easily reusable.

Also added a ton of tests!

Change-Id: Ic8f0a70c8222370352e63533b329c40457c0903e
 2015-10-16 12:13:08 -07:00
Erik Kline
2b49a7df64 Merge "Incorrect time used in some NTP server responses" 2015-10-16 19:02:00 +00:00
Matthew Williams
6331753e3b am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit 'b01a963a2dd3e4e84eee18f691efdc7856d16ff0':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 19:01:55 +00:00
Matthew Williams
b01a963a2d am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 
* commit '6875011626e5815473b5d19ddc92d4888bad29f4':
  DO NOT MERGE Change scheduling logic to run network jobs sooner
 2015-10-16 18:55:33 +00:00
Matthew Williams
6875011626 Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 2015-10-16 18:51:48 +00:00
Chris Craik
cb45c10b81 Merge "Use FastJNI for trivial MotionEvent native methods" 2015-10-16 18:41:04 +00:00
Chris Craik
0fc1065af7 Use FastJNI for trivial MotionEvent native methods 
Change-Id: I97d0643a6e34cb66ca5b5948ed47ebfee14fc038
 2015-10-16 11:39:50 -07:00