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

195871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
3370b6c95e am 5e4c382d: resolved conflicts for merge of 17ba2e6c to mnc-dev 
* commit '5e4c382d15968c757fb9c5783cbd420156ea8ad2':
  Calculate outsets before window frame adjustment.
 2015-06-08 22:14:38 +00:00
Filip Gruszczynski
5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev 
Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
 2015-06-08 15:00:25 -07:00
John Spurlock
c2fbbcc797 am e37cf3b8: Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 
* commit 'e37cf3b8d614019c5570f945110bfbc5a8b09713':
  QS: Handle font-size changes immediately in ZenModePanel.
 2015-06-08 21:12:29 +00:00
Joseph Wen
970b9c2ac1 am d8ffe624: Merge "Update Statement Service." into mnc-dev 
* commit 'd8ffe624b22a289b4f87af84acb05327b7818e53':
  Update Statement Service.
 2015-06-08 21:05:25 +00:00
Geoff Mendal
5911363fad am 59b28c0c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '59b28c0c9cff7eda3974ae861c550c3d37af6412':
  Import translations. DO NOT MERGE
 2015-06-08 21:05:21 +00:00
John Spurlock
e37cf3b8d6 Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 2015-06-08 21:03:57 +00:00
Joseph Wen
d8ffe624b2 Merge "Update Statement Service." into mnc-dev 2015-06-08 20:56:25 +00:00
Geoff Mendal
59b28c0c9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 20:53:03 +00:00
Etan Cohen
03609df355 am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit '7631697793a8b82bb2a1cd3adced1b140d266427':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 20:39:40 +00:00
Etan Cohen
7631697793 Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 2015-06-08 20:29:14 +00:00
John Spurlock
d896323eab QS: Handle font-size changes immediately in ZenModePanel. 
And make sure the condition row is tall enough to accomodate
huge text.

Bug: 20346315
Change-Id: I9346f80edd7f0069d6363fe5377b36b0bf5aca62
 2015-06-08 16:26:12 -04:00
Wale Ogunwale
549ac6925a am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit 'd8b9b642feab52523ec6db7b170b08f1bc74b004':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:21:25 +00:00
John Spurlock
50e98a33ec am c0f7aff3: Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev 
* commit 'c0f7aff3df237e5990d8bff1b52e96cff17f745b':
  Zen QS: Use explicit content descriptions for zen buttons.
 2015-06-08 20:21:20 +00:00
keunyoung
b7ee0ba43b am 7da9d7aa: Merge "apply force hiding of window only when it is main display" into mnc-dev 
* commit '7da9d7aa52751434ee869ccd6a1e71d2a9b7f5cd':
  apply force hiding of window only when it is main display
 2015-06-08 20:21:15 +00:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Geoff Mendal
4ad2b0c829 Import translations. DO NOT MERGE 
Change-Id: I45739d8c8ae447a724264c4946aedd273a308d91
Auto-generated-cl: translation import
 2015-06-08 13:15:33 -07:00
John Spurlock
c0f7aff3df Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev 2015-06-08 20:13:09 +00:00
keunyoung
7da9d7aa52 Merge "apply force hiding of window only when it is main display" into mnc-dev 2015-06-08 20:08:49 +00:00
Nathan Harold
48f193a859 am 71feb72b: Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 
* commit '71feb72b76777afa10dca555287f954d63deeb9d':
  Fix a typo in the docstring of getAllCellInfo()
 2015-06-08 20:08:19 +00:00
James Cook
1bc661c9a6 am 5ac36cea: Merge "Use VoiceInteractor.Prompt in VoiceInteraction test app" into mnc-dev 
* commit '5ac36cea8611d15027c4353e3c8ef932d6ad437a':
  Use VoiceInteractor.Prompt in VoiceInteraction test app
 2015-06-08 20:08:14 +00:00
Chris Craik
4353870591 am 37cf0771: Merge "Add projection info to RenderNode dumps" into mnc-dev 
* commit '37cf07717137a41fd5c3724fe9c44de2f89a7f8c':
  Add projection info to RenderNode dumps
 2015-06-08 20:08:10 +00:00
Andrew Flynn
1292b59612 am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '21a4f17c942165684bc590de594984912459396d':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:08:05 +00:00
Nathan Harold
71feb72b76 Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 2015-06-08 20:05:07 +00:00
James Cook
5ac36cea86 Merge "Use VoiceInteractor.Prompt in VoiceInteraction test app" into mnc-dev 2015-06-08 20:03:39 +00:00
Etan Cohen
e4dc7e1ac3 Update documentation of CARRIER_PRESENCE & bitmasks. 
Bug: 21572292
Change-Id: If4727e7c18ce94f7c715ac91d61456ff0de10001
 2015-06-08 13:02:44 -07:00
Chris Craik
37cf077171 Merge "Add projection info to RenderNode dumps" into mnc-dev 2015-06-08 20:00:37 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService" 
This reverts commit 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
 2015-06-08 19:59:29 +00:00
Dianne Hackborn
09653fc5ee am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '54d729b73f54798d3112129894cb6fe8ef75920b':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 19:56:00 +00:00
keunyoung
7a542b66e0 apply force hiding of window only when it is main display 
- force hiding window for non-main display leads into stopping
  rendering of windows in non-main display.
- change the logic to skip force hiding if it is not main display.

bug: 21665476

Change-Id: I2e23f3a2d6e3cbf6819ade1798360efe2986e80e
 2015-06-08 12:55:51 -07:00
Mike Lockwood
ac4c704b4e am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit '383ce580b1c9e706d1b06a23d81986f3b4ed83fb':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 19:51:26 +00:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Nathan Harold
fde06fd323 Fix a typo in the docstring of getAllCellInfo() 
Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
 2015-06-08 12:38:40 -07:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
John Spurlock
a1c7ffe755 Zen QS: Use explicit content descriptions for zen buttons. 
Bug: 21661136
Change-Id: I3a6f7d6deb29584e707c1deb771e3db660007529
 2015-06-08 15:34:05 -04:00
Makoto Onuki
610b517a4d am e4bd7c98: Improve string comment. 
* commit 'e4bd7c98323b39a47682216bebf442de206a95dd':
  Improve string comment.
 2015-06-08 19:21:26 +00:00
Makoto Onuki
e4bd7c9832 Improve string comment. 
Bug 21685729

Change-Id: If6c79730778f399ed0dbf500ef62df3150fbaea6
 2015-06-08 12:11:01 -07:00
Jorim Jaggi
e7f4d006f6 am 0e0942d5: Hide top and bottom bar while dozing 
* commit '0e0942d55d62e820ecdc2c7ec25b02fca169fa79':
  Hide top and bottom bar while dozing
 2015-06-08 18:55:27 +00:00
Jorim Jaggi
0e0942d55d Hide top and bottom bar while dozing 
Bug: 18903923
Change-Id: I7b222f9dd168101084f3ee4cbbe6f9495818eab4
 2015-06-08 18:43:26 +00:00
Chris Craik
bf72eb80d9 Add projection info to RenderNode dumps 
bug:21502154

Also fixes several issues around DISPLAY_LIST_DEBUG

Change-Id: I726f5bc071f8c037ffe1b224175fe5c1e2b1c5bd
 2015-06-08 11:39:02 -07:00
dcashman
9a5016622d am b5766468: Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev 
* commit 'b5766468538de200d26012d96019db26bccac5d4':
  Add SYSTEM_DIR check to upgrade-key-set verification.
 2015-06-08 18:29:48 +00:00
dcashman
b576646853 Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev 2015-06-08 18:20:47 +00:00
Alex Klyubin
ac1240633a am 26689464: Merge "Remove deprecated android.security.KeyStore methods." into mnc-dev 
* commit '266894644a160a93949cb82f5f969bef4ad91532':
  Remove deprecated android.security.KeyStore methods.
 2015-06-08 18:17:41 +00:00
Alex Klyubin
4aa87af3ab am 2c500236: Merge "RSA encrypt with private key in Android Keystore." into mnc-dev 
* commit '2c500236f4892b62b4df140f7e61f219a07371e0':
  RSA encrypt with private key in Android Keystore.
 2015-06-08 18:17:37 +00:00
John Reck
1b89d8f841 am 5b688e84: Merge "Disable -Werror on Clang" into mnc-dev 
* commit '5b688e848c05d8ce0903348b3644184df3d5711a':
  Disable -Werror on Clang
 2015-06-08 18:17:33 +00:00
John Reck
da15ccfedc am 3bd053f9: Merge "Fix clang warnings" into mnc-dev 
* commit '3bd053f9780424b0a293881966fd38b226f4b923':
  Fix clang warnings
 2015-06-08 18:17:28 +00:00
Alex Klyubin
266894644a Merge "Remove deprecated android.security.KeyStore methods." into mnc-dev 2015-06-08 18:11:21 +00:00
Alex Klyubin
2c500236f4 Merge "RSA encrypt with private key in Android Keystore." into mnc-dev 2015-06-08 18:10:09 +00:00
John Reck
5b688e848c Merge "Disable -Werror on Clang" into mnc-dev 2015-06-08 18:08:33 +00:00
John Reck
3bd053f978 Merge "Fix clang warnings" into mnc-dev 2015-06-08 18:08:19 +00:00