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

56980 Commits

Author SHA1 Message Date
Dianne Hackborn
fae8cbfe90 am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '8070053f6266c98bcffca335b4642d415638b05c':
  Add public constant for usage stats app op.
 2014-09-02 22:04:12 +00:00
Raph Levien
44a233952e am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '2e97ac0cccdb8625385dc2373ce1a0d8e5f18b2c':
  Ensure layout in getExtendedPadding calls
 2014-09-02 22:04:08 +00:00
Dianne Hackborn
7b7b754fab Merge "Add public constant for usage stats app op." into lmp-dev 2014-09-02 21:54:56 +00:00
Raph Levien
4c5ea10caf Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 2014-09-02 21:53:26 +00:00
Raph Levien
463cf1aea8 Ensure layout in getExtendedPadding calls 
There are cases in which getExtendedPaddingTop() and Bottom can get
called even without a valid layout. This patch just makes sure there
is some reasonable layout available.

Fix for bug 14819392 "java.lang.NullPointerException in
android.widget.TextView"

Change-Id: I203899402ddfe857a688b16b7855a8991eee82b7
 2014-09-02 14:23:18 -07:00
Mathieu Chartier
a81d660b9c am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev 
* commit 'b980f4607d67ccafb43d86e5fd7b35806b65acfa':
  Add missing null check to ninePatchInsets
 2014-09-02 20:14:25 +00:00
Mathieu Chartier
8c94a8f280 Merge "Add missing null check to ninePatchInsets" into lmp-dev 2014-09-02 20:07:05 +00:00
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
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
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
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
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
Amith Yamasani
2cdcc7d360 Merge "Make it possible to remove current user" into lmp-dev 2014-09-02 17:21:58 +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
George Mount
b4558e7e5f Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 2014-09-02 16:20:06 +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
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback 
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
 2014-09-01 23:49:57 -07:00
Baligh Uddin
8e3cd7c4db Import translations. DO NOT MERGE 
Change-Id: I7fab5997699dba037e40150ea6484993efe6577f
Auto-generated-cl: translation import
 2014-09-01 17:29:48 -07:00
Baligh Uddin
bfb3009f84 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-01 21:25:58 +00:00
Adrian Roos
a3ce27792b am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 
* commit '5e28745716363fcfad6d88651846d7c6dc4d4ea3':
  Trust: Look at the security unlock method of the right user
 2014-09-01 21:19:02 +00:00
Adrian Roos
ab84dba863 Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 2014-09-01 21:13:12 +00:00
Adrian Roos
1572ee379e Trust: Look at the security unlock method of the right user 
Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7.

Bug: 17107213
Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
 2014-09-01 23:03:28 +02:00
Christoph Studer
d044a0392b am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev 
* commit '7e1e2109e76d99fefa5ca98180dff098a6eca996':
  Notification: Reset view params for re-use
 2014-09-01 19:39:32 +00:00
Christoph Studer
9c70889274 Merge "Notification: Reset view params for re-use" into lmp-dev 2014-09-01 19:26:56 +00:00
Christoph Studer
fe718433e0 Notification: Reset view params for re-use 
Since RemoteViews are reapplied in SysUI, reset potentially
modified view params before configuring it.

Bug: 17175860
Change-Id: I0eceb1522461f8302e69af1a995a8d036951d1ed
 2014-09-01 21:01:21 +02:00
Jorim Jaggi
73962c51d7 am faecb0b4: Merge "Media notification updates" into lmp-dev 
* commit 'faecb0b40a1ac2371d93d245e2a65a22ce4b1f0c':
  Media notification updates
 2014-09-01 16:02:00 +00:00
Jorim Jaggi
dfa4037e88 Merge "Media notification updates" into lmp-dev 2014-09-01 15:52:02 +00:00
Jorim Jaggi
17ee3ec0b8 Media notification updates 
- Make text white.
- Adjust padding & metrics to redlines.
- Use different narrow layout when 3 or less notifications with big
  picture.
- Update action ripples.
- Fix progress bar size & fix color for indeterminate progress bar.
- Apply default background in SystemUI when no color is set, so we
  don't end up with white text on white background.

Bug: 15437369
Bug: 16625746
Bug: 15147533
Change-Id: Ie8bd5ad0bbca972685adb50034fff88ea97456bd
 2014-09-01 17:26:51 +02:00
Yohei Yukawa
d80d8645d7 am 08e56027: Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev 
* commit '08e560277327ee4fea86d642948e2195a874344a':
  Get rid of one redundant comparison of #mComposingTextStart
 2014-09-01 14:43:26 +00:00
Yohei Yukawa
9477891f23 Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev 2014-09-01 14:31:56 +00:00
Yohei Yukawa
e05d4ca4dc Get rid of one redundant comparison of #mComposingTextStart 
The code in question is not only redundant but also
harmful because it causes unnecessary integer boxing.

BUG: 17340578
Change-Id: Ife6e48889db80394d224297c53806105dc41d56e
 2014-08-31 18:29:37 -07:00
George Mount
b180f1a7bb am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 
* commit '4e51bc36f0d03deb85451a10e83b1e92740be457':
  Fix NPE in EnterTransitionCoordinator.
 2014-08-31 23:03:00 +00:00
George Mount
3acc8f14cd Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 2014-08-31 22:52:43 +00:00
George Mount
7e5df46a2a am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev 
* commit '8ee63e6ce6e9d6e873eee6d331449b93fb44852c':
  Use optimized Keyframes for Path animations.
 2014-08-31 22:27:37 +00:00
George Mount
6690e3a167 Merge "Use optimized Keyframes for Path animations." into lmp-dev 2014-08-31 22:17:46 +00:00
Baligh Uddin
de4e396b4b Import translations. DO NOT MERGE 
Change-Id: I2e8d61b219485d45e8446750dc0b416a6e58a453
Auto-generated-cl: translation import
 2014-08-31 13:39:48 -07:00
Amith Yamasani
1df1473008 Make it possible to remove current user 
Due to the async nature of switching users, it's not possible to
switch and remove immediately. So mark the switch target user as
soon as the user switch is requested, so that a remove will proceed
without failing at stopUserLocked().

Also, fix a similar problem with deleting the current guest and
switching to a new guest. It was attempting to remove the current
user which will result in a failed stopping of the user.
Added a way to mark the current guest
for deletion so that a new one can be created, switched to and the
old one deleted. If runtime fails, old guest is already marked for
deletion and will be cleaned up on restart.

Bug: 17321533
Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
 2014-08-29 22:06:16 -07:00
Ruben Brunk
0f946d172a am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit 'ea33afcb1fe0747b427ece6e73fe4f64e741fead':
  camera2: Add HDR vendor tag for legacy mode.
 2014-08-30 00:33:01 +00:00