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

208498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
6ae3ec4535 am d14cbeab: am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'd14cbeabbc6fba855161f07cfe0b9abf910d6d4e':
  Update permission icons to final versions - framework
 2015-07-23 21:49:01 +00:00
George Mount
d254685497 am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '44543451206a107934c9c74ed5a53d43d73070e8':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 21:48:55 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +00:00
Adrian Roos
aebb144b3c am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'e674e9500c723848e896d281fc4bf45285689170':
  Touch, wake and unlock
 2015-07-23 21:48:42 +00:00
Steve McKay
73610b37de Include padding in calculation of column count. 
Also rename background color and don't sepcify background in grid items.

Change-Id: I4b565604156864384626e75f0bfd41c98623f90a
 2015-07-23 14:47:58 -07:00
Jun Mukai
d2e7e355d8 Allow sticky immersive mode by mouse hover. 
When the app enters into the immersive mode, swipe down from the
top edge makes immersive_sticky (showing transient status bar),
but this is hardly done by mouse. As is discussed in the bug,
we want to make the same effect for mouse hover at the very top
line of the screen for 500msec.

Same applied to navigation bar with the bottom of the screen.

Bug: 20093789
Change-Id: If4484b5bcee567ea89c28ed06807564cb8f9ccef
 2015-07-23 13:31:04 -07:00
Zhentao Sun
e965289b57 am f26a9a20: am c6cd1f9a: Added service that listens for gestures. 
* commit 'f26a9a20ae6ad03022cb01643415b67152f90ab7':
  Added service that listens for gestures.
 2015-07-23 19:48:57 +00:00
Adrian Roos
2f1220c419 am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '2237c32fe1dfcd13056970ff987ee92326aee5c1':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:48:51 +00:00
Fred Chung
fd7db2095c am a201140b: am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit 'a201140bb42c77adaf8714f05d7c2341690e4445':
  Doc change: add note about not exiting on onPause().
 2015-07-23 19:48:44 +00:00
Dianne Hackborn
26b2453ca4 am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'd363399b97c57d573eade7ff757b17c8257a5b83':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:48:38 +00:00
Alex Klyubin
3ad847959e am b1d68c90: am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'b1d68c90f09d97ba7988ba061906ab286978dcad':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 19:48:31 +00:00
Wale Ogunwale
6cd07625ec am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit '1aaf7d6cb9e88876879a7b8fbfc51c2c97bca82d':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:48:25 +00:00
Kenny Guy
72be506795 am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit 'af52ae07eee76f99c64ecd6346f3c6a9d4d77f20':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:48:19 +00:00
Jason Monk
1a2f8f7c11 am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '3260194f206e90508b01d2fc0187516c940fbd0c':
  Fix blank tiles on QS rotate
 2015-07-23 19:48:13 +00:00
Jason Monk
76d79fb097 am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'f91bc8709f95d8a69d9b95fadf9066eff6223a7d':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:48:06 +00:00
Jim Miller
8c98f38676 am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8cc0e80f06f98025b88e581025a2bec85f03cdd9':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:48:00 +00:00
Svetoslav Ganov
d14cbeabbc am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '8276a97fceed62cd30e9f41af1e4e96b49c619ca':
  Update permission icons to final versions - framework
 2015-07-23 19:47:54 +00:00
George Mount
4454345120 am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'c2c3eacb4c41d5eff0a53be1f4e6dc94d8928300':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:47:48 +00:00
Jorim Jaggi
93a25f77bb am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fba926118ed7d5465cb6e7b64d29153212f7cbee':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:47:40 +00:00
Adrian Roos
e674e9500c am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit '9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1':
  Touch, wake and unlock
 2015-07-23 19:47:35 +00:00
Colin Cross
353e6a1b8c am a083ef9a: am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'a083ef9a7b882a249928ed928adf6af61a525e37':
  Use build_number from file
 2015-07-23 19:25:47 +00:00
Zhentao Sun
f26a9a20ae am c6cd1f9a: Added service that listens for gestures. 
* commit 'c6cd1f9a83b2807ef7434b6775a07e1e9208d4e0':
  Added service that listens for gestures.
 2015-07-23 19:21:29 +00:00
Adrian Roos
2237c32fe1 am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:21:24 +00:00
Fred Chung
a201140bb4 am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '9478ddfa11a2f16e3234d4c6251fffa0d8527936':
  Doc change: add note about not exiting on onPause().
 2015-07-23 19:21:19 +00:00
Dianne Hackborn
d363399b97 am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '863504111546fb46fcb5af356efb267c8582018a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:21:14 +00:00
Alex Klyubin
b1d68c90f0 am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '568e67a322deb027480fb85e6d4082b78d907d57':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 19:21:07 +00:00
Wale Ogunwale
1aaf7d6cb9 am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'aecf9ba839d440fb89055bcb8454cf72d0afaf41':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:21:02 +00:00
Kenny Guy
af52ae07ee am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2adcb40d2ce3706543f3e545ce93e9231b94971c':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:20:57 +00:00
Jason Monk
3260194f20 am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1df7e135196ca3c8a6a51a9b741e12782afa039c':
  Fix blank tiles on QS rotate
 2015-07-23 19:20:53 +00:00
Jason Monk
f91bc8709f am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '67091f46fa16537563a6c095a5bd044499bc2ea5':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:20:48 +00:00
Jim Miller
8cc0e80f06 am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '4a31ee0a745e048a2c9c4db1444404373c1d606b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:20:41 +00:00
Svetoslav Ganov
8276a97fce am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '010b53c029eac203c445d81ecfca01c242111365':
  Update permission icons to final versions - framework
 2015-07-23 19:20:37 +00:00
George Mount
c2c3eacb4c am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '27fbd360a8256cf6321da9ba29bab02b3d241aba':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:20:32 +00:00
Jorim Jaggi
fba926118e am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:20:27 +00:00
Adrian Roos
9fb98375e8 am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock
 2015-07-23 19:20:22 +00:00
Jorim Jaggi
5091ca9c82 am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit 'ac73f1efea0cb23881571e18e87ffc7f388af7ad':
  Partially fix that beginning of animation is skipped
 2015-07-23 19:18:15 +00:00
Dianne Hackborn
419f2177c8 am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-23 19:18:10 +00:00
Colin Cross
a083ef9a7b am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
 2015-07-23 19:11:22 +00:00
Colin Cross
bbcc914b18 am 01efd7e8: Merge "Use build_number from file" 
* commit '01efd7e820edb9677491f28af999d825f21711a4':
  Use build_number from file
 2015-07-23 18:48:22 +00:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00:00
Tim Volodine
08a38b68e9 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" 2015-07-23 17:27:27 +00:00
Tim Volodine
0bb7d2e467 Revert "Invoke geolocation permissions callback with denied state by default." 
This reverts commit 954d1333c478d4dba6c9a0536510da4fd94c0622.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
 2015-07-23 17:16:16 +00:00
Filip Gruszczynski
0867d26270 Merge "Fix NPE when requesting outsets for detached view." 2015-07-23 16:05:48 +00:00
Geoff Mendal
6ec08c8d04 Merge "Import translations. DO NOT MERGE" 2015-07-23 09:51:53 +00:00
Tomasz Mikolajewski
3f78e175ac Add COLUMN_CAPACITY_BYTES column to DocumentsContract. 
Alternatives were considered:
- COLUMN_CAPACITY dounds more like real english sentence, but it is
  inconsistent with consistent with COLUMN_AVAILABLE_BYTES.
- COLUMN_USED_BYTES is consistent with COLUMN_AVAILABLE_BYTES but we rarely
  care about used bytes, more about total capacity. Such information is also
  rarely exposed by backends, and would have to be computed, so misleading.

BUG=None

Change-Id: Ic1ff3eb8fc9ec12cc79ee78c490f361f77cb4706
 2015-07-23 18:06:11 +09:00
Tomasz Mikolajewski
4dc4cb09ce Merge "Add support for efficient move within a document provider." 2015-07-23 08:53:39 +00:00
Geoff Mendal
94b42e14ab Import translations. DO NOT MERGE 
Change-Id: I98fedc0c8bbeb169abb974d0a246fa6413a7eea5
Auto-generated-cl: translation import
 2015-07-23 00:29:38 -07:00
Tomasz Mikolajewski
a375a99884 Add support for efficient move within a document provider. 
Currently moving files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where moving even huge files can be
instant.

This CL adds an optional moveDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
moving things. If not implemented, we would fallback to moving by
streaming.

BUG=None

Change-Id: I74d6754f96cbafa749a04ca9aebf2e0e2b64b515
 2015-07-23 16:00:05 +09:00
Tomasz Mikolajewski
024fcf7e22 Merge "Add support for efficient copy within a document provider." 2015-07-23 06:07:25 +00:00
Tomasz Mikolajewski
74fe1816e8 Add support for efficient copy within a document provider. 
Currently copying files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where copying even huge files can be
instant.

This CL adds an optional copyDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
copying things. If not implemented, we would fallback to copying by
streaming.

BUG=None

Change-Id: I8f2b2c0c834717f07d42f8247cd1fc025e82239a
 2015-07-23 13:43:49 +09:00