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

152195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
a7ed66c798 am 32b59261: am 5cff0b76: Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev 
* commit '32b5926150b129b8d84bddca4dc95d1e42e48a20':
  Start TvInputManagerService when the device supports FEATURE_LIVE_TV
 2014-08-28 16:07:11 +00:00
Jae Seo
1ce8e2b175 am 5cff0b76: Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev 
* commit '5cff0b76bb73a4efd35598e4c90fb2847fbf5217':
  Start TvInputManagerService when the device supports FEATURE_LIVE_TV
 2014-08-28 15:55:32 +00:00
Jae Seo
f6a5d34167 Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev 2014-08-28 15:45:02 +00:00
Selim Cinek
075d4141bc am 3ec368c1: am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev 
* commit '3ec368c1a18982eaed446e60a4f9fde05f853549':
  Fixed a flash of the preview image when going to the dialer
 2014-08-28 13:55:34 +00:00
Selim Cinek
07c0d68e5c am 9f1a9f49: am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev 
* commit '9f1a9f49de0e88cb4b4c66a6e14eb6cc98289c9a':
  Fixed a bug where notifications could remain in the overlay.
 2014-08-28 13:55:23 +00:00
John Spurlock
356014f7a8 am 9736f6a4: am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev 
* commit '9736f6a4550307f3025ca8c458da6440bed318a6':
  Zen: Remove alarm warnings, color the subhead instead.
 2014-08-28 13:49:40 +00:00
Lajos Molnar
a9063962ea am 05366fef: am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 
* commit '05366fef16c5c54d3289645d1d94a05f3eb0e9e5':
  media: update MediaCodec/Info/List/Format APIs based on review comments
 2014-08-28 13:49:35 +00:00
Selim Cinek
f1d8349bb3 am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner 
* commit 'b6f60439e7ce36d582c508075f030e04933f0d0f':
  Added a warning when the profile has an owner
 2014-08-28 13:49:25 +00:00
Selim Cinek
e2557b4e33 am b2cb86ee: Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev 
* commit 'b2cb86eef21897285244d2216ca9fbafa70adfd9':
  Fixed a flash of the preview image when going to the dialer
 2014-08-28 13:48:18 +00:00
Selim Cinek
9ddc82dff3 am a5ed4d38: Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev 
* commit 'a5ed4d381d4f1ca6b5056b7aefd2e5bc7b8c9667':
  Fixed a bug where notifications could remain in the overlay.
 2014-08-28 13:48:14 +00:00
Selim Cinek
1a08a8f52f Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev 2014-08-28 13:37:23 +00:00
John Spurlock
c22fd76b66 am 9af66133: Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev 
* commit '9af66133917d4cb0a5252f9f52e1352e72637bf0':
  Zen: Remove alarm warnings, color the subhead instead.
 2014-08-28 13:36:47 +00:00
Lajos Molnar
93e8318ad5 am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 
* commit 'cb28f8533e4640be00c23e0332469995953fa1ba':
  media: update MediaCodec/Info/List/Format APIs based on review comments
 2014-08-28 13:36:42 +00:00
Selim Cinek
9a37d4bc3c am 1bebe3c0: Added a warning when the profile has an owner 
* commit '1bebe3c049c41a13bd5143c7ceec9d222ddd2d7d':
  Added a warning when the profile has an owner
 2014-08-28 13:36:37 +00:00
Selim Cinek
05546f455d Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev 2014-08-28 13:36:00 +00:00
John Spurlock
d7a94b3545 Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev 2014-08-28 13:30:31 +00:00
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Dan Sandler
13b0086c3a am 3dd1a1f0: am a673ee62: Merge "Update soundscape for L, using classic names." into lmp-dev 
* commit '3dd1a1f0aba35d4ce0a1b5d550a6d65b0a631f6b':
  Update soundscape for L, using classic names.
 2014-08-28 13:12:39 +00:00
Selim Cinek
0d61b51852 Fixed a flash of the preview image when going to the dialer 
The preview image was animating even though it should not have
leading to a weird flash.

Bug: 17261091
Change-Id: I168eae25eb654ceb79e055fb0d0189c31cb0bb3d
 2014-08-28 15:09:29 +02:00
Selim Cinek
95ed59283b Fixed a bug where notifications could remain in the overlay. 
This led to notifications being visible even though they should
have been removed

Bug: 17295716
Change-Id: I05a243d5c9ca359d1f5ca29a7535935d6e61a4d6
 2014-08-28 15:09:29 +02:00
Selim Cinek
24ac55e658 Added a warning when the profile has an owner 
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.

Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
 2014-08-28 15:09:28 +02:00
Dan Sandler
771aeaf390 am a673ee62: Merge "Update soundscape for L, using classic names." into lmp-dev 
* commit 'a673ee6209fd64acafafb867ab40c6944ca56696':
  Update soundscape for L, using classic names.
 2014-08-28 13:00:34 +00:00
Dan Sandler
e6afe9c75c Merge "Update soundscape for L, using classic names." into lmp-dev 2014-08-28 12:49:26 +00:00
Jorim Jaggi
d0bca271e3 am 0b198fa9: am 1c20d304: Start intent chooser after Keyguard is gone 
* commit '0b198fa9d4151243fb98936c3b19e33b466fcc7b':
  Start intent chooser after Keyguard is gone
 2014-08-28 12:42:03 +00:00
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
74610a7b9c am 222fb84e: am 6b5a7d82: Merge "Fix large text setting for QS" into lmp-dev 
* commit '222fb84ecc32032147a8414a69bbf3e7d6023442':
  Fix large text setting for QS
 2014-08-28 11:21:59 +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
524735e3ba am 18cc6ef2: am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 
* commit '18cc6ef2eadd6ffa15cbdefe59270bda8a94bf4b':
  Make it possible to disable camera on lockscreen
 2014-08-28 11:10:03 +00: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
Esteban Talavera
20b41f85f0 am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'da3a898110b91fb913e539e38b68233d12bf54ca':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 10:49:21 +00: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
996b5af40c Start TvInputManagerService when the device supports FEATURE_LIVE_TV 
Bug: 17284986
Change-Id: I5efeffecfcb771cb2e6180ccfd665464611a24fc
 2014-08-27 23:52:01 -07:00
Jae Seo
41b12ff46b am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 
* commit 'edf8161ea45f134b0732634aac8afa7836f1bab1':
  Add android.software.live_tv feature
 2014-08-28 06:07:54 +00:00
Jae Seo
3220eafa7d am f69d30a0: am 3de3e67b: API Review: TV 
* commit 'f69d30a0c6c6e68b86926053393fe1243f56c892':
  API Review: TV
 2014-08-28 06:07:50 +00: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
73f61292ad am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit 'e1c0d6f0a03b09debe9a0b5e735f368ea1eceef2':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 05:14:05 +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
Dan Sandler
f56a345482 Update soundscape for L, using classic names. 
(partial revert of commit 7348f744)

Bug: 15725449
Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965
 2014-08-28 00:40:26 -04:00
Selim Gurun
9342a657d9 am 405c03ad: am 8f1de303: Merge "Address API Feedback" into lmp-dev 
* commit '405c03aded694e85ee278f650a19988a8c17f8c4':
  Address API Feedback
 2014-08-28 03:39:27 +00:00
John Reck
59f71093fe am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
  Animator stuff
 2014-08-28 03:39:21 +00:00
Svetoslav
eebff5a5a1 am 84805a00: am b4bd1427: Merge "Fix live region updates." into lmp-dev 
* commit '84805a00a3ed0234948b76274c93a60f36e96e00':
  Fix live region updates.
 2014-08-28 03:39:16 +00:00