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

151048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsuwei Chen
d311b09cf4 am 1c1a2cc9: Merge "Reload GPS configuration after carrier info is available. Bug: 17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev 
* commit '1c1a2cc96aa427c4c719fd48e3ac00c81d73dc70':
  Reload GPS configuration after carrier info is available. Bug: 17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
 2014-09-02 18:58:48 +00:00
Paul Lawrence
5961a2effb am 4fdbcb33: Add constants so we can distinguish decryption failures 
* commit '4fdbcb3312a85bfe1256144b27b58908aaf73a13':
  Add constants so we can distinguish decryption failures
 2014-09-02 18:42:49 +00:00
Tsuwei Chen
1611c21dfd Merge "Reload GPS configuration after carrier info is available. Bug: 17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev 2014-09-02 18:36:37 +00:00
Paul Lawrence
e2c88d39b2 Add constants so we can distinguish decryption failures 
Bug: 17213613
Change-Id: I6bc10a1ed0855f6946ea9eb2f8d2db00c1af327c
 2014-09-02 18:26:32 +00:00
Christopher Tate
eaacf716bb am 44cfdacb: Merge "Don\'t rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev 
* commit '44cfdacbcc34ec8a20026041854c6e475b4adc9d':
  Don't rewrite package restrictions unconditionally in findPreferredActivity()
 2014-09-02 18:22:30 +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
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
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
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
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
Amith Yamasani
2cdcc7d360 Merge "Make it possible to remove current user" into lmp-dev 2014-09-02 17:21:58 +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
RoboErik
17a1b48629 Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 2014-09-02 16:58:30 +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
ztenghui
6a08b8f9b4 Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev 2014-09-02 16:17:01 +00:00
Sungsoo Lim
75f903e123 Merge "Do not show the input icon when it's not available." into lmp-dev 2014-09-02 16:16:02 +00:00
Sungsoo Lim
3633832063 Do not show the input icon when it's not available. 
Bug: 17335230
Change-Id: Icb84949ed55f22bb384df9ed4bbfe3d86949c301
 2014-09-02 09:13:43 -07:00
Robin Lee
e5c21c3d84 am 8d5246ed: Merge "Delete locksettings files for toplevel users only" into lmp-dev 
* commit '8d5246eda35272bacf861e0ecc4f006b9fa9720b':
  Delete locksettings files for toplevel users only
 2014-09-02 15:58:39 +00:00
Robin Lee
89369b29db Merge "Delete locksettings files for toplevel users only" into lmp-dev 2014-09-02 15:51:51 +00:00
Selim Cinek
2e22d7ae42 am d4fbac6e: Merge "Fixed a bug in the notification touch selection." into lmp-dev 
* commit 'd4fbac6e8304baf0c08254d6778a79ab6cc0a429':
  Fixed a bug in the notification touch selection.
 2014-09-02 15:46:19 +00:00
Tyler Gunn
2c830a2905 Remove "ask each time" SIP call setting. (1/2) 
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.

Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
 2014-09-02 08:39:35 -07:00
Selim Cinek
9547fd4a2e Merge "Fixed a bug in the notification touch selection." into lmp-dev 2014-09-02 15:37:06 +00:00
Christoph Studer
1f7e0f0da1 am f7363473: Merge "SysUI: Ignore group children when summary is present" into lmp-dev 
* commit 'f736347370ef485e9bd3c138e2d02d0db033a295':
  SysUI: Ignore group children when summary is present
 2014-09-02 15:34:02 +00:00
Christoph Studer
e0320054a7 Merge "SysUI: Ignore group children when summary is present" into lmp-dev 2014-09-02 15:22:17 +00:00
Jorim Jaggi
a86944db09 am c7bdf1ab: Merge "Fix expanded notifications on lockscreen" into lmp-dev 
* commit 'c7bdf1ab11f2c66b8db6023ac817b142b2ec15f1':
  Fix expanded notifications on lockscreen
 2014-09-02 15:16:05 +00:00
Robin Lee
1096cf8664 Delete locksettings files for toplevel users only 
Fixes an issue created by change:
    I7941707ca66ac25bd122fd22e5e0f639e7af697e

Bug: 16233206
Change-Id: Ia905d153e94303acd611178333adc77c68933711
 2014-09-02 16:12:06 +01:00
Jorim Jaggi
2debc99efa Merge "Fix expanded notifications on lockscreen" into lmp-dev 2014-09-02 15:07:37 +00:00
Jorim Jaggi
e62d589bea Fix expanded notifications on lockscreen 
Bug: 17340086
Change-Id: I388f859cea1ad5daf195590512ee684e88b9299c
 2014-09-02 16:32:23 +02:00