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

145383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
53c7fce508 am 8410ced8: am 607281ff: Delete most network scorer tests from coretests. 
* commit '8410ced8134bc81ea726f075a70ae6556b8ca3fe':
  Delete most network scorer tests from coretests.
 2014-07-23 16:55:16 +00:00
Jae Seo
d9c1e38e3d am b6dee043: am 41f1050a: am e3316cfe: Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 
* commit 'b6dee0435ec2073627d3c01370af9110e3249451':
  TIF: Use @SystemApi for APIs that we intend to open to OEMs
 2014-07-23 16:53:28 +00:00
Jeff Davidson
6d5570ee36 am 69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev 
* commit '69c976c665ddde192157cbf9a4cc31df83af1c75':
  Expose NETWORK_SCORE_SERVICE as @SystemApi.
 2014-07-23 16:46:23 +00:00
Jeff Davidson
9a70f97a74 am 607281ff: Delete most network scorer tests from coretests. 
* commit '607281ffc1ac13ecc3d51c52d2d0a57c33d2c358':
  Delete most network scorer tests from coretests.
 2014-07-23 16:46:20 +00:00
Jae Seo
a54c87e606 am 41f1050a: am e3316cfe: Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 
* commit '41f1050aa3c03a7625f13ad0b2975ef2dc9ef672':
  TIF: Use @SystemApi for APIs that we intend to open to OEMs
 2014-07-23 16:46:13 +00:00
Jae Seo
ef5450ecf5 am e3316cfe: Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 
* commit 'e3316cfefd3ca2f6aa4928a39f62eea9a67c4e53':
  TIF: Use @SystemApi for APIs that we intend to open to OEMs
 2014-07-23 16:40:47 +00:00
Jeff Davidson
3824db6141 Delete most network scorer tests from coretests. 
Anything which tests public API functionality will be moved to a
compatibility test suite.

The only remaining test is NetworkScorerAppManagerTest, which contains
unit tests for an internal helper class that is not (and should not
be) exposed via @SystemApi or otherwise.

Bug: 16355542
Change-Id: I478da97d3a4d09407992af37e45466dc484fa8cf
 2014-07-23 09:40:24 -07:00
Jungshik Jang
a80c81470c am 50c8ab40: am a6501c7a: am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit '50c8ab40e3c46561a9a9f5e8eb518fdf960a73cf':
  Fix unknown tag @throw
 2014-07-23 14:42:59 +00:00
Jungshik Jang
01b9a90a80 am a6501c7a: am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit 'a6501c7aeeeba1d93948d226c7b83d5f757e9297':
  Fix unknown tag @throw
 2014-07-23 14:38:55 +00:00
Jungshik Jang
4630072c78 am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit '0062e49d753903cf440353085f2ed31a17c23ab0':
  Fix unknown tag @throw
 2014-07-23 14:34:51 +00:00
Chris Wren
73cc43da36 am f03ef334: am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit 'f03ef334c4e91643ba834d136b489f28cfbaf117':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:32:35 +00:00
Chris Wren
941d57ad86 am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit '43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:28:54 +00:00
Chris Wren
3ec0f95def am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit 'eb6f138b8156f292acca1026a9df3b9132aea63e':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:23:46 +00:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00
Chris Wren
839ebf934f am 632fc54e: am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '632fc54ee1c4ca2fb29408a6a65be02ba3e66f3a':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 13:26:39 +00:00
Santos Cordon
2189b75a05 am 5ec0bb4c: am 22900e4e: am ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 
* commit '5ec0bb4c233998e6c4f39dd0a3c906d9a3d214ad':
  Change display Strings to CharSequence (1/3)
 2014-07-23 13:26:35 +00:00
Chris Wren
bd65c7ac28 am 09401565: am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit '09401565fa471596b37e9780c347c54cedbb84a8':
  Honor the sort and group keys for notification ranking.
 2014-07-23 13:26:31 +00:00
Narayan Kamath
316409725d am d9434a47: am f6aa06c8: am 3bd0b010: Merge "Add an internal API to get all asset locales." into lmp-dev 
* commit 'd9434a47f082059928df2ec7173926b8119f358b':
  Add an internal API to get all asset locales.
 2014-07-23 13:26:27 +00:00
Narayan Kamath
da4fd348df am ad268ac9: am 0c479058: am c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 
* commit 'ad268ac9f16e6cdffe8eb75e430e39a5b217d24e':
  Remove copy of Locale.adjustLanguageCode.
 2014-07-23 13:26:23 +00:00
Bryan Mawhinney
fbeaead282 am 3e90363e: am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit '3e90363e815629318d65bb8e2b98b2b9efa9c882':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 13:26:18 +00:00
Nicolas Prevot
3cf8714489 am 06a9e5b8: am b5b6f33e: am ea6f0c52: Fixing cross-user content. 
* commit '06a9e5b8fd3abccdc2c24ec53b2fcb484948402b':
  Fixing cross-user content.
 2014-07-23 13:26:14 +00:00
Jungshik Jang
d611df99dc am 7722d859: am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit '7722d859bb4c4e54632ddf7529e4bfca7dff00a7':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 13:26:10 +00:00
Youngsang Cho
3df361a8b1 am ed979b92: am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs 
* commit 'ed979b920c8a15536dc9bec7cbf394726cb68b6b':
  Block logging watched histories for passthrough inputs
 2014-07-23 13:26:06 +00:00
Youngsang Cho
3b817d78ca am 86416c26: am 7ab36b39: am 02d93880: Enable customization of TvInputInfo icon/label 
* commit '86416c265a158b0fe06a8ad36e053e51e81561c8':
  Enable customization of TvInputInfo icon/label
 2014-07-23 13:26:02 +00:00
Chris Wren
9246171277 am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '1ef27c1c9e9fb035951ca88881399fa3f57564df':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 12:59:09 +00:00
Santos Cordon
7989f57403 am 22900e4e: am ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 
* commit '22900e4e8dbee3d02bca1fc3bed5f7a7205596e3':
  Change display Strings to CharSequence (1/3)
 2014-07-23 12:59:05 +00:00
Chris Wren
636f360ba5 am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit '14d65e68ad753c2384785061ea6e470a995dcab6':
  Honor the sort and group keys for notification ranking.
 2014-07-23 12:59:01 +00:00
Narayan Kamath
435d1047b1 am f6aa06c8: am 3bd0b010: Merge "Add an internal API to get all asset locales." into lmp-dev 
* commit 'f6aa06c89146943c034df48c94a7fdc57a715693':
  Add an internal API to get all asset locales.
 2014-07-23 12:58:55 +00:00
Narayan Kamath
f1a316e750 am 0c479058: am c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 
* commit '0c479058c2660b746f9ce19659d6db6b328af13a':
  Remove copy of Locale.adjustLanguageCode.
 2014-07-23 12:58:51 +00:00
Bryan Mawhinney
645a63bc4a am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit '64ccca0d703bb176799216fa84e17bec352f02d3':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 12:58:47 +00:00
Nicolas Prevot
2a9844c5cc am b5b6f33e: am ea6f0c52: Fixing cross-user content. 
* commit 'b5b6f33e777a62fc400e21ab73c2a78ba1c974e9':
  Fixing cross-user content.
 2014-07-23 12:58:43 +00:00
Jungshik Jang
cfd1fa6357 am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit 'c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 12:58:38 +00:00
Youngsang Cho
74065729c4 am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs 
* commit '5b0fca67b75204fb886e541719e6f049ed932dc5':
  Block logging watched histories for passthrough inputs
 2014-07-23 12:58:34 +00:00
Youngsang Cho
4325bff67c am 7ab36b39: am 02d93880: Enable customization of TvInputInfo icon/label 
* commit '7ab36b39b66c63f2ef2a1a0a113413fb5cbdde5c':
  Enable customization of TvInputInfo icon/label
 2014-07-23 12:58:30 +00:00
Chris Wren
0a414d082d am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '8980a58dec0ac898596c6e1b94bf3e1c2825bec8':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 12:51:42 +00:00
Santos Cordon
3acee763dc am ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 
* commit 'ca8e44fb5ae5eb9206d9d61408b90ade31d33e8f':
  Change display Strings to CharSequence (1/3)
 2014-07-23 12:51:37 +00:00
Chris Wren
ec31793788 am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit 'df09d4c348f9f2aea10391b27d157d8b71a9e189':
  Honor the sort and group keys for notification ranking.
 2014-07-23 12:51:34 +00:00
Narayan Kamath
8aec957108 am 3bd0b010: Merge "Add an internal API to get all asset locales." into lmp-dev 
* commit '3bd0b0105cae24e8265df73a2541dc2f0d630bfe':
  Add an internal API to get all asset locales.
 2014-07-23 12:51:26 +00:00
Narayan Kamath
6c0e4ebd62 am c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 
* commit 'c0fb18a215467be0f5bdc25fb6d5612349bc989b':
  Remove copy of Locale.adjustLanguageCode.
 2014-07-23 12:51:22 +00:00
Bryan Mawhinney
4177112c34 am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit 'd5d3525a92fd42238b03635d2389509feee88389':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 12:51:06 +00:00
Nicolas Prevot
6cb4f0c98c am ea6f0c52: Fixing cross-user content. 
* commit 'ea6f0c5248e4026da863f85ead9a7ee7062c4174':
  Fixing cross-user content.
 2014-07-23 12:51:02 +00:00
Jungshik Jang
ee4ed4e305 am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit 'da251030221ef58ebd03471aa249f7ad3000c7ff':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 12:50:58 +00:00
Youngsang Cho
819093b32c am 76f8d671: Block logging watched histories for passthrough inputs 
* commit '76f8d6714a64a101e281fbe3a24c2289f9a79a8f':
  Block logging watched histories for passthrough inputs
 2014-07-23 12:50:54 +00:00
Youngsang Cho
754eb5c322 am 02d93880: Enable customization of TvInputInfo icon/label 
* commit '02d938801ae4b53cce217eadeadc15f29683f267':
  Enable customization of TvInputInfo icon/label
 2014-07-23 12:50:49 +00:00
Chris Wren
4a24fd3c7b Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Bug: 15190903
Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
 2014-07-23 10:36:57 +00:00
Bryan Mawhinney
e191f901d9 Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
So that they can be bridged appropriately by Android Wear

Change-Id: I3a21a74991c8067ece1a04fbd0b92dd21438e0fd
 2014-07-23 08:49:28 +00:00
Nicolas Prevot
66adae84d7 Fixing cross-user content. 
Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e
 2014-07-23 08:35:21 +00:00
Jungshik Jang
bffb0635aa Add startTimerRecording api to IHdmiControlService. 
In order to support timer recording we need separate API,
startTimerRecording. Also added HdmiTimerRecordingSources
which is used to help creating timer recording information
such as timing information and program information.

Besides, in order to distinguish one touch record
and timer recording, rename startRecord with startOneTouchRecording.

Bug: 16160962
Change-Id: I8c3d4034665a2f84ddf07135aee73e17ac17cd82
 2014-07-23 16:12:10 +09:00
Sander Alewijnse
0c1dcfd161 Merge "Add Device Policy API to disable screen capture." into lmp-dev 2014-07-23 05:48:23 +00:00
Sander Alewijnse
d2a1eec400 Add Device Policy API to disable screen capture. 
WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.

Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
 2014-07-23 13:44:28 +00:00