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

208755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
85ce138d5e am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1a2f8f7c117c9b2377827a73043928b9d86eb550':
  Fix blank tiles on QS rotate
 2015-07-23 21:49:22 +00:00
Jason Monk
d621727d0b am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '76d79fb097c2cb0731c67457f3f0cd72237c01e8':
  Fix crash in NetworkControllerImpl
 2015-07-23 21:49:13 +00:00
Jim Miller
a7bc2e0aef am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8c98f38676d9da5df54f7819d9391beb802ce0ec':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 21:49:07 +00:00
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
Svetoslav Ganov
607bc34f93 Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev 2015-07-23 21:46:53 +00:00
Svetoslav Ganov
258e630a6b Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 2015-07-23 21:44:58 +00:00
Tim Kilbourn
115189fd6b am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev 
* commit 'cc855ad737e61fc02a057e811f2e6e34bbff0e37':
  Properly synchronize interactivity state.
 2015-07-23 20:51:57 +00:00
Tim Kilbourn
cc855ad737 Merge "Properly synchronize interactivity state." into mnc-dev 2015-07-23 20:39:44 +00:00
Jason Monk
e648ccbbf7 am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '157ad64dbeedd43a444d3eb1cc538ee975ed2d59':
  Fix emergency only when no sims
 2015-07-23 20:36:16 +00: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
Jason Monk
157ad64dbe Merge "Fix emergency only when no sims" into mnc-dev 2015-07-23 20:24:32 +00:00
Julia Reynolds
9bef274ce9 am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit 'c2df1ab48d4d12fc0e1f68fe6b5cc505e681b9f4':
  Set 'the' media notification to the notification actually playing.
 2015-07-23 20:19:59 +00:00
Julia Reynolds
c2df1ab48d Merge "Set 'the' media notification to the notification actually playing." into mnc-dev 2015-07-23 20:08:33 +00: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
Jorim Jaggi
9c95638495 am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit '1d071ce9b1810fbcf231fd17c4cb5621e68ff419':
  Make sure expandingFinished gets called when going into QS
 2015-07-23 19:32:37 +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
Wenchao Tong
25975f1b22 am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev 
* commit 'bf3a24d5ec004a46cc75b947226fb7c23e4a0ed1':
  Ignore the active network scorer when checking for idleness
 2015-07-23 19:20:51 +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
John Reck
e5783e58db am 2abf0f24: Fix a race condition that could cause lockup 
* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup
 2015-07-23 19:20:47 +00:00
Amith Yamasani
5a18b4bfe2 am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev 
* commit 'b3e407609f567884f9322e7b34461baa14e3f3ae':
  Avoid a deadlock between PMS and AppOpsService
 2015-07-23 19:20:41 +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
Alex Klyubin
155d41a0f2 am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev 
* commit '304b01c2493f16c2537563b3e00e4770765942a2':
  Document what algorithms Android Keystore supports.
 2015-07-23 19:20:32 +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
Junda Liu
e1ebca6c1e am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 
* commit '859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47':
  Remove volte_feature_disabled as carrier config handled it.
 2015-07-23 19:20:27 +00:00