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

152172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jinsuk Kim
4fe8a815e6 am 58afc5c4: am 235b2e66: Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 
* commit '58afc5c4ce6d1538028b26a32d97187cc83414ff':
  CEC: return non-null MHL controller when not ready
 2014-08-28 03:38:38 +00:00
Santos Cordon
538dbaee16 am 4db2f706: am 2dac2b7d: Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev 
* commit '4db2f7063fff109d4142595d9fe08bf4dc445239':
  Call onPhoneDestroyed when the service is unbound.
 2014-08-28 03:38:33 +00:00
Yorke Lee
1238a8e7d3 am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '9aedb262a98532e30658c00e5acff33c1b7c32a9':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 03:38:18 +00:00
Dongwon Kang
b266bdcca0 am 4146f007: am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit '4146f007d65d52f75ce7781562747d2c15a892f1':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 03:38:06 +00:00
Michael Wright
17f7fa5cfe am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f7898245a265106672ff29f35289c703ed50c7ce':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 03:38:00 +00:00
Christopher Tate
2f123e65c1 am ed7e8009: am 977b314b: Merge "Do not require device provisioning to do restore-at-install" into lmp-dev 
* commit 'ed7e80096b3b392a94a5d7f5ef321c0f5997911f':
  Do not require device provisioning to do restore-at-install
 2014-08-28 03:37:55 +00:00
Filip Gruszczynski
bbc0f67195 am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '2a81e91f63c14ddf04c82a124096553c36924344':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-28 03:37:54 +00: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