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

150527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
109cb57afa am 1c20d304: Start intent chooser after Keyguard is gone 
* commit '1c20d304810aa73ae5a73fc8c555599d33fc411f':
  Start intent chooser after Keyguard is gone
 2014-08-28 12:30:01 +00:00
Jorim Jaggi
746f7facf2 Start intent chooser after Keyguard is gone 
If we have an intent chooser on the camera intent, we need to launch
it after the Keyguard is fully gone because the ResolveActivity would
finish itself if it is launched behind the Keyguard.

Bug: 16570873
Change-Id: I2fdb4975fa0a6510e8853c6042383089570ec1f5
 2014-08-28 13:10:12 +02:00
Jorim Jaggi
ff24c77811 am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev 
* commit '6b5a7d8247b46da8d14fe4e0bb2cf309eb68b9ce':
  Fix large text setting for QS
 2014-08-28 11:09:28 +00:00
Jorim Jaggi
2cad81b2a2 am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 
* commit '5df9d4c47d12424fb5d6653fef6b8e8952af40b5':
  Make it possible to disable camera on lockscreen
 2014-08-28 10:57:46 +00:00
Jorim Jaggi
d757d6bfc6 Merge "Fix large text setting for QS" into lmp-dev 2014-08-28 10:57:45 +00:00
Jorim Jaggi
e17c4b49a4 Fix large text setting for QS 
Bug: 15591223
Change-Id: I9f514a4970edbda778b987dfc3eca3914e492011
 2014-08-28 12:49:32 +02:00
Jorim Jaggi
87078b738b Merge "Make it possible to disable camera on lockscreen" into lmp-dev 2014-08-28 10:46:37 +00:00
Esteban Talavera
906f50f71b am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'f734047a69439bec6a94fb3cd4eae8dda9fafa14':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 10:38:09 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked 
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
 2014-08-28 10:56:18 +01:00
Jae Seo
5a88fac3f9 am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 
* commit '9d86176de52b8ec0bca948ef8a3aee72dbbc231d':
  Add android.software.live_tv feature
 2014-08-28 05:56:12 +00:00
Jae Seo
ffb6579136 am 3de3e67b: API Review: TV 
* commit '3de3e67bbe8fb8968d0841288f8aa6bf39a8286a':
  API Review: TV
 2014-08-28 05:56:08 +00:00
Jae Seo
11cfe2c036 Merge "Add android.software.live_tv feature" into lmp-dev 2014-08-28 05:50:19 +00:00
Jae Seo
a899be4ebd API Review: TV 
This change addresses the following feedback:

- "ageHint" attribute should be renamed to "contentAgeHint"
- "country" attribute should be doc'd to specify valid formats (two
character country codes or whatever)

Bug: 17293643
Change-Id: Ia5e58e191c3678bb2d6b1be36c4275d323675ad9
 2014-08-28 05:48:36 +00:00
Jae Seo
7a76b8b46d am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '5bb8065ac550918dbd5bee060583615d37cad810':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 05:02:07 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Selim Gurun
82aa67bd1e am 8f1de303: Merge "Address API Feedback" into lmp-dev 
* commit '8f1de303d4c6a9ecf0089f257e0815f5f51d3fa4':
  Address API Feedback
 2014-08-28 02:24:51 +00:00
John Reck
eed938d217 am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit 'ad0faa702254af9c34ed2a94a0566772ae0d9493':
  Animator stuff
 2014-08-28 02:24:27 +00:00
Svetoslav
c60c33e132 am b4bd1427: Merge "Fix live region updates." into lmp-dev 
* commit 'b4bd1427c267cd7db900aa075a5dc4fc3f8e80ca':
  Fix live region updates.
 2014-08-28 02:24:20 +00:00
Jinsuk Kim
16b9675e1a am 235b2e66: Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 
* commit '235b2e66b30c514faf7b0ef4d2fd69f0a8860488':
  CEC: return non-null MHL controller when not ready
 2014-08-28 01:56:49 +00:00
Santos Cordon
7b42eed092 am 2dac2b7d: Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev 
* commit '2dac2b7dc74794f8d1bccb2a34584ce9c25eed72':
  Call onPhoneDestroyed when the service is unbound.
 2014-08-28 01:56:41 +00:00
Selim Gurun
d576bf310b Merge "Address API Feedback" into lmp-dev 2014-08-28 01:47:31 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00
Svetoslav
040a7f0526 Merge "Fix live region updates." into lmp-dev 2014-08-28 01:37:43 +00:00
Jinsuk Kim
af410a5145 Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 2014-08-28 00:59:03 +00:00
Santos Cordon
0e85f35514 Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev 2014-08-28 00:57:46 +00:00
Selim Gurun
17d1adb183 Address API Feedback 
Bug: 17253647

This is Part I of API feedback. It does not address portions
of the feedback that is still pending a response from API council.

Change-Id: I6ae250c6455a5545912623aeb34332d564fffde7
 2014-08-27 17:56:08 -07:00
John Reck
119907cd25 Animator stuff 
Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
 2014-08-27 17:44:25 -07:00
Santos Cordon
f30d7e9a8e Call onPhoneDestroyed when the service is unbound. 
Bug: 17253031
Change-Id: I1a74e0f2fe1ec9172268638dba531c17d22dee99
 2014-08-27 17:29:29 -07:00
Yorke Lee
d81c4b4195 am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit 'e4ba7f2bfe6f77bc677780f7256209de1893ed6e':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 00:23:41 +00:00
Yorke Lee
fe7c3bc082 Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 2014-08-28 00:16:27 +00:00
Dongwon Kang
f0285d8c2b am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit '62df6072388ce1018455a79eeeb12ba3fcfbf6b2':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 00:15:50 +00:00
Michael Wright
0f7016841d am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'd0f6975b8b3581bfdcdd94d293e25e1ac0706d19':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 00:15:45 +00:00
Christopher Tate
afab9ecffb am 977b314b: Merge "Do not require device provisioning to do restore-at-install" into lmp-dev 
* commit '977b314b85e197a0024b3f232ff249e9418197d2':
  Do not require device provisioning to do restore-at-install
 2014-08-28 00:15:40 +00:00
Dongwon Kang
162fa7f41b Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 2014-08-28 00:00:58 +00:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Christopher Tate
89972815a2 Merge "Do not require device provisioning to do restore-at-install" into lmp-dev 2014-08-28 00:00:48 +00:00
Filip Gruszczynski
825102d77d am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '21187a7a57bf6455fb2ffa8a7cf27fb20308a0b1':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-27 23:30:52 +00:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER 
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
 2014-08-27 16:28:12 -07:00
Filip Gruszczynski
30a480bcfc Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 2014-08-27 23:22:29 +00:00
Alan Viverette
79dbddefbb am 79bd9953: Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 
* commit '79bd9953b25bb7be002784ecddaa15bcf14b806a':
  Preserve inner drawable bounds and level on mutate
 2014-08-27 22:41:27 +00:00
Filip Gruszczynski
f14d924cd7 Allowing isRound and outsetBottom properties to be passed to ActivityView. 
We remove requirement for having display id == 0 or allow circumventing it
through a flag.

Change-Id: Ia4671614b51894393d47e681cc72718d394230f6
 2014-08-27 15:38:24 -07:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY 
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
 2014-08-27 15:37:27 -07:00
Alan Viverette
327710e36f Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 2014-08-27 22:29:19 +00:00
Tim Kilbourn
e76d4e26c2 am 6f9d8dd7: Merge "Update leanback shadow parameters." into lmp-dev 
* commit '6f9d8dd760104a47dd9f754fd6a4f96665d3fb00':
  Update leanback shadow parameters.
 2014-08-27 22:26:23 +00:00
Tim Kilbourn
12ed679911 Merge "Update leanback shadow parameters." into lmp-dev 2014-08-27 22:07:37 +00:00
Eric Laurent
1c2d8c2d45 am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 
* commit 'db1c0e1964f514ccaab1cc1b6325f5db0fe11fd0':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
 2014-08-27 21:59:21 +00:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Jim Miller
8730bdf76c am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit 'c5cabe2d00450cb18f856618260e0fa7d780452b':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 21:44:15 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00