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

197612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
82aa5f2cf5 am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '09653fc5ee5f2050f61e055d773d0f873c71b6db':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 20:02:02 +00:00
Mike Lockwood
e89f9d8af7 am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit 'ac4c704b4ef233f12c649f6e20794dd1aeb28a1d':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 20:01:57 +00: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
Makoto Onuki
0def58a15d am 610b517a: am e4bd7c98: Improve string comment. 
* commit '610b517a4d01b38aa9bb391e6deaa25b0ce445d9':
  Improve string comment.
 2015-06-08 19:35:38 +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
35049981f0 am e7f4d006: am 0e0942d5: Hide top and bottom bar while dozing 
* commit 'e7f4d006f60cba932f839dfce6e8cfe199c7dace':
  Hide top and bottom bar while dozing
 2015-06-08 19:08:49 +00: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
dcashman
6bd28c0804 am 9a501662: am b5766468: Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev 
* commit '9a5016622d8414b71f09ba1407138aa8388a37fa':
  Add SYSTEM_DIR check to upgrade-key-set verification.
 2015-06-08 18:42:40 +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
Alex Klyubin
51e6062f6a am ac124063: am 26689464: Merge "Remove deprecated android.security.KeyStore methods." into mnc-dev 
* commit 'ac1240633a17810eb610245c6250b90c4826e360':
  Remove deprecated android.security.KeyStore methods.
 2015-06-08 18:33:46 +00:00
Alex Klyubin
62e44c2f49 am 4aa87af3: am 2c500236: Merge "RSA encrypt with private key in Android Keystore." into mnc-dev 
* commit '4aa87af3abb66d190284cf7f063d77c8c7ba548c':
  RSA encrypt with private key in Android Keystore.
 2015-06-08 18:33:40 +00:00
John Reck
c50051539e am 1b89d8f8: am 5b688e84: Merge "Disable -Werror on Clang" into mnc-dev 
* commit '1b89d8f8417ddc8feaae2ab5cebfcbd1e5e2407e':
  Disable -Werror on Clang
 2015-06-08 18:33:35 +00:00
John Reck
031e7c18ca am da15ccfe: am 3bd053f9: Merge "Fix clang warnings" into mnc-dev 
* commit 'da15ccfedc034d797d63cfe8f7dad7b7ada4bc53':
  Fix clang warnings
 2015-06-08 18:33:30 +00: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
Wale Ogunwale
b75323e20c am 1b5da5d7: am 281dffb7: Merge "Include launched packageName in systrace." into mnc-dev 
* commit '1b5da5d77b875e1cfc769278b17cbca92e7b4879':
  Include launched packageName in systrace.
 2015-06-08 18:22:48 +00:00
Adam Lesinski
2d3b04db58 am 3cc350ea: am ce1590da: Merge "Wait for wakeup_reasons on first init" into mnc-dev 
* commit '3cc350ea7438ca00439a5f640e5600f2c60825f5':
  Wait for wakeup_reasons on first init
 2015-06-08 18:22:42 +00:00
Dimitry Ivanov
c346c393ce am eb748a39: am 25bb4553: Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-dev 
* commit 'eb748a3966ceac695d78c9faee6f20615cd1e812':
  Revert "Print exception stacktrace on failed scanPackageLI"
 2015-06-08 18:22:35 +00:00
Amit Mahajan
db7ae3d81b am 5b422dd9: am 829c0977: Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 
* commit '5b422dd97c3c6b2fbbd51b631ece93251e2f8b66':
  Adding temporary logging to debug CTS failure (for CellLocationTest).
 2015-06-08 18:22:30 +00:00
Amit Mahajan
4a8d8d5995 am 4033cb11: am 9b5e2124: Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 
* commit '4033cb11b6fcd81cb4115f3873f9618641aa69df':
  Changing getSimState to use slot idx instead of sub id.
 2015-06-08 18:22:24 +00:00
Andrew Flynn
b98430c84b am b443bcce: am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'b443bcce8f4f3e25fe7282d3be96de3747df0660':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 18:22:18 +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