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

153047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
df56f2b6f6 am 7256c156: am 9ffdc3bd: Merge "Use separate icon group for signal/battery in QS header" into lmp-dev 
* commit '7256c1560d3d52fff23d559eecd764dea1d7fcef':
  Use separate icon group for signal/battery in QS header
 2014-09-02 18:21:26 +00:00
Christopher Tate
e93e6c81f2 Merge "Don't rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev 2014-09-02 18:09:08 +00:00
Michael Wright
ac023ddb45 am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit 'b1ff74c91cf947246aa0f874030b82bff70e81fd':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:01:49 +00:00
Jean-Michel Trivi
0dc5ae577a am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit 'cd46ad9833c8ed07d8a33e3925f7978d7d5c88a0':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:01:45 +00:00
Svet Ganov
375c9c1ff1 am 5906bbfb: Merge "Magnification bounds not always animated on a looper thread." into lmp-dev 
* commit '5906bbfbed44245a917a9b88cf51aa88c17de993':
  Magnification bounds not always animated on a looper thread.
 2014-09-02 18:01:40 +00:00
Jorim Jaggi
041d14f72d am 9ffdc3bd: Merge "Use separate icon group for signal/battery in QS header" into lmp-dev 
* commit '9ffdc3bd05cf7c3835014ac755ab023bf1d0367d':
  Use separate icon group for signal/battery in QS header
 2014-09-02 18:01:36 +00:00
Tyler Gunn
c855fa5991 am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit 'a8c7d1bcf5de323a8a5b8e3fff0c7759be06118e':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 18:00:00 +00:00
Dianne Hackborn
86f0c17e4b am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '4e784a505cb76e00e88dcf00c7b41b6ff0417964':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 17:59:55 +00:00
Dianne Hackborn
5064e7c70c Add public constant for usage stats app op. 
Change-Id: Ibc031b50e9fa4f1bd0955e0afd98e8b1bd77b905
 2014-09-02 10:57:16 -07:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7 Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 2014-09-02 17:52:46 +00:00
Tyler Gunn
c6eafead44 am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit '78c0d4ab75c61efc48af1a698fd7d36620523866':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 17:45:49 +00:00
Dianne Hackborn
a86520b3c0 am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '4b9a934cef4de4985c0e316ef89ca41b3e720135':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 17:45:44 +00:00
Alan Viverette
376d10e99e Update pointer hotspots to scale for DPI 
Also updates the bitmap resources, which weren't scaled correctly
for their respective DPI buckets.

BUG: 16459309
Change-Id: Iedc781e2ee47a8b960390fea718cb08bcfb84ae3
 2014-09-02 10:45:30 -07:00
Svet Ganov
6906771d76 Merge "Magnification bounds not always animated on a looper thread." into lmp-dev 2014-09-02 17:43:18 +00:00
Jorim Jaggi
210052e7c7 Merge "Use separate icon group for signal/battery in QS header" into lmp-dev 2014-09-02 17:43:11 +00:00
Ronghua Wu
ea34edbee6 am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit 'eaa9befb1e981d58a8e4d248c88d4fe204d06ea9':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 17:43:10 +00:00
Yorke Lee
9e47ee6011 am 659b0417: am 38a10cd4: Merge "Add lookup key to callerInfo" into lmp-dev 
* commit '659b0417d7ebb5069032c5c8fa685ac93bc6e11d':
  Add lookup key to callerInfo
 2014-09-02 17:42:59 +00:00
Amith Yamasani
4f34c86f3c am e681727f: am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev 
* commit 'e681727f0106b67824e6315e5473232b42f54120':
  Make it possible to remove current user
 2014-09-02 17:42:54 +00:00
Jorim Jaggi
06d551ac62 Use separate icon group for signal/battery in QS header 
This reverts the terrible hack that reattaches the system icons when
expanding QS. This primarily fixes that the alpha of the icons was
wrong when closing the shade, but also fixes flickering when expanding
the shade.

Bug: 17338013
Change-Id: Ifcbe03eca43ed7639059734e23d740c1b8a7a9de
 2014-09-02 17:42:25 +00:00
Jean-Michel Trivi
4a4fea0752 Restore permission check for mic muting 
The implementation for AudioManager.setMicrophoneMute() used to
 call directly into AudioSystem which called directly into
 AudioFlinger and the mediaserver process, where the check for
 the MODIFY_AUDIO_SETTINGS is performed.
A regression was introduced by Ib32138bcc256cfbac4fe21a090d5ba34f5c641fc
 which calls first into AudioService which runs in system_process
 before calling into AudioSystem, which granted the permission.
This CL adds a permission check in this code path when calling
 AudioService.

Bug 17259652

Change-Id: I4ac5269262eb90df80ee81db6ec3d96977ee53be
 2014-09-02 10:38:27 -07:00
Tyler Gunn
4b7498d81f Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 2014-09-02 17:31:39 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService. 
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
 2014-09-02 10:29:28 -07:00
Ronghua Wu
7db0561cda am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit 'e4999af808ac0e48932e3ac843df9bb9e6a45c46':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 17:29:21 +00:00
Yorke Lee
d88b1b9269 am 38a10cd4: Merge "Add lookup key to callerInfo" into lmp-dev 
* commit '38a10cd4bbe74c4d815810a759860e8da7c5e3a8':
  Add lookup key to callerInfo
 2014-09-02 17:29:16 +00:00
Amith Yamasani
5dc010644e am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev 
* commit '9bdf3963a64d8eb0b66705da3922c464badaa539':
  Make it possible to remove current user
 2014-09-02 17:29:12 +00:00
Ronghua Wu
a7118c9bb2 Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 2014-09-02 17:27:26 +00:00
Yorke Lee
9dfea28fa8 Merge "Add lookup key to callerInfo" into lmp-dev 2014-09-02 17:24:55 +00:00
RoboErik
0e9a3b8b86 am c9942120: am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 
* commit 'c9942120358223073d440588a1b600ec84a023a8':
  Update MediaBrowser to use String ids instead of Uris
 2014-09-02 17:23:07 +00:00
Amith Yamasani
2cdcc7d360 Merge "Make it possible to remove current user" into lmp-dev 2014-09-02 17:21:58 +00:00
Nick Kralevich
10170acbc6 am 60888dba: am 0988daaa: Merge "Add testing api to SELinuxMMAC code." 
* commit '60888dbad1919634a61fc4f1e96126a3c387a228':
  Add testing api to SELinuxMMAC code.
 2014-09-02 17:15:42 +00:00
RoboErik
77c8179427 am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 
* commit 'b7d24c7539ba40159a34ad1b7bcb173e3c066dc5':
  Update MediaBrowser to use String ids instead of Uris
 2014-09-02 17:09:42 +00:00
Nick Kralevich
60888dbad1 am 0988daaa: Merge "Add testing api to SELinuxMMAC code." 
* commit '0988daaa23b469b3021ad93f819736160e21391f':
  Add testing api to SELinuxMMAC code.
 2014-09-02 17:03:32 +00:00
RoboErik
17a1b48629 Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 2014-09-02 16:58:30 +00:00
Nick Kralevich
0988daaa23 Merge "Add testing api to SELinuxMMAC code." 2014-09-02 16:52:13 +00:00
Robert Craig
99891156fc Add testing api to SELinuxMMAC code. 
Added needed api for local unit testing.

Change-Id: If52555ecb4f0e6bc06e153b6a17e2c706b11253e
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-09-02 12:50:29 -04:00
Jae Seo
16fd9afe29 am 88a6ada7: am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 
* commit '88a6ada7ae19ebbed6419d4e60afac5162f744fa':
  TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
 2014-09-02 16:38:27 +00:00
Jae Seo
bfb54de468 am 057043e7: am e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev 
* commit '057043e767aa3131158ef290e21f9f06faa04c55':
  TIF: Fix the Singapore content ratings
 2014-09-02 16:38:23 +00:00
George Mount
94d23608eb am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit '8e95e5f75073aa7a43fba25ae9fc257ddc6159e6':
  Update window always on convertTo/FromTranslucent
 2014-09-02 16:38:18 +00:00
ztenghui
e358dd6ac0 am f431aeab: am bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev 
* commit 'f431aeab0db82bc7fdd0c50446990c4b7496609b':
  Fix the (0,0) vector case for extra vertices computation
 2014-09-02 16:38:12 +00:00
Sungsoo Lim
5401502602 am 9586eaa4: am d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev 
* commit '9586eaa4a6add78595589539754531bb8ec623fc':
  Do not show the input icon when it's not available.
 2014-09-02 16:38:07 +00:00
Jae Seo
f6c03553dd am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 
* commit '746a550b31627e3d40c416d7ef35ae351898b938':
  TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
 2014-09-02 16:25:22 +00:00
Jae Seo
d1b0d4b2a1 am e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev 
* commit 'e42eaea72d69c26b338d4783e4ff30e4f86b952b':
  TIF: Fix the Singapore content ratings
 2014-09-02 16:25:18 +00:00
George Mount
d32dd2e349 am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit '8fd72d49213971e8a2ef84831c0035692a877870':
  Update window always on convertTo/FromTranslucent
 2014-09-02 16:25:13 +00:00
ztenghui
e0a07bed0c am bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev 
* commit 'bb63ef1298cf4505cfb44000d00c97e34fa975cb':
  Fix the (0,0) vector case for extra vertices computation
 2014-09-02 16:25:08 +00:00
Sungsoo Lim
880a0ef539 am d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev 
* commit 'd15591a70faf8890aab69c5e6bb51138e8241aea':
  Do not show the input icon when it's not available.
 2014-09-02 16:25:03 +00:00
Jae Seo
65899b1092 Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 2014-09-02 16:20:28 +00:00
Jae Seo
9e85408f12 Merge "TIF: Fix the Singapore content ratings" into lmp-dev 2014-09-02 16:20:10 +00:00
George Mount
b4558e7e5f Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 2014-09-02 16:20:06 +00:00