OSDN Git Service
RoboErik [Wed, 23 Jul 2014 20:52:45 +0000 (20:52 +0000)]
am
989779bb: am
ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
* commit '
989779bba5811dfcf1d9c0ff12d21469dfac3b72':
Return appropriately scaled artwork to RemoteController
RoboErik [Wed, 23 Jul 2014 20:48:57 +0000 (20:48 +0000)]
am
ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
* commit '
ae5b411b181e872c9a66fb504eb1ea789f601698':
Return appropriately scaled artwork to RemoteController
Jeff Sharkey [Wed, 23 Jul 2014 20:33:16 +0000 (20:33 +0000)]
am
af043268: am
7bf4f48f: Remove APK observers.
* commit '
af043268f0f27620be25de18109c7e1ba691906f':
Remove APK observers.
Yao Chen [Wed, 23 Jul 2014 20:33:12 +0000 (20:33 +0000)]
am
b0bc2aad: am
9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
* commit '
b0bc2aad61a11d97494f3e0e14e0b49c09563fbe':
various fixes in MediaBrowserItem and MediaBrowserService
Jeff Sharkey [Wed, 23 Jul 2014 20:29:36 +0000 (20:29 +0000)]
am
7bf4f48f: Remove APK observers.
* commit '
7bf4f48f7ca2c53a88b3aed6329a2d44eae7a96c':
Remove APK observers.
Yao Chen [Wed, 23 Jul 2014 20:29:33 +0000 (20:29 +0000)]
am
9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
* commit '
9ea412ab9ecf1c78549542ce9f1715e814a7ba59':
various fixes in MediaBrowserItem and MediaBrowserService
Jae Seo [Wed, 23 Jul 2014 20:28:01 +0000 (20:28 +0000)]
Jeff Sharkey [Wed, 23 Jul 2014 20:22:43 +0000 (13:22 -0700)]
Remove APK observers.
Most app installations have migrated to the new cluster-style layout
where each app is placed in a unique directory. There are now two
general issues with these observers:
We can't know when a push/sync has finished delivering all splits
for an app. Also, inotify isn't recursive, so we'd have to manage
watches for each app directory.
Change-Id: I3770fa9059ddf80f933a3804714f2e52591fce49
Jae Seo [Wed, 23 Jul 2014 20:23:16 +0000 (20:23 +0000)]
Jae Seo [Wed, 23 Jul 2014 20:02:14 +0000 (13:02 -0700)]
Fix build
Change-Id: Icc1bf76ef748b10cc7ea745bc37c4e7bc0d7ff43
Gabriel Peal [Wed, 23 Jul 2014 20:12:47 +0000 (20:12 +0000)]
am
6aac8cf7: am
f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* commit '
6aac8cf7bccf5ab47b89fa69d9963c123701bcbb':
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
Gabriel Peal [Wed, 23 Jul 2014 20:08:20 +0000 (20:08 +0000)]
am
f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* commit '
f2b4f70b459928d796fa9efa925e979f73bbf6b8':
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
Robert Greenwalt [Wed, 23 Jul 2014 19:53:51 +0000 (19:53 +0000)]
am
819917e3: am
dc9d7aa7: Merge "Reenable logging." into lmp-dev
* commit '
819917e3eb54dacba025c8516ed7d8b5eeaf419b':
Reenable logging.
Robert Greenwalt [Wed, 23 Jul 2014 19:49:06 +0000 (19:49 +0000)]
am
dc9d7aa7: Merge "Reenable logging." into lmp-dev
* commit '
dc9d7aa70adbf2f2d2e582d9164d72a3a98627ce':
Reenable logging.
Tao Bai [Wed, 23 Jul 2014 19:28:00 +0000 (19:28 +0000)]
am
d5874836: am
9ba09c25: Merge "WebView permission change" into lmp-dev
* commit '
d5874836d84053a2f887470200901008f6797735':
WebView permission change
Tao Bai [Wed, 23 Jul 2014 19:23:49 +0000 (19:23 +0000)]
am
9ba09c25: Merge "WebView permission change" into lmp-dev
* commit '
9ba09c250c00bd97c8282c772d47a6728f9cd4e2':
WebView permission change
Eino-Ville Talvala [Wed, 23 Jul 2014 19:23:47 +0000 (19:23 +0000)]
am
6cfa6b5b: am
e2894174: Camera2: Fix callback operation
* commit '
6cfa6b5b1ca3ecab93337835792f2afb71613d5a':
Camera2: Fix callback operation
Eino-Ville Talvala [Wed, 23 Jul 2014 19:19:41 +0000 (19:19 +0000)]
am
e2894174: Camera2: Fix callback operation
* commit '
e289417427410e5892e252ac08d3b9569a68a21c':
Camera2: Fix callback operation
Craig Mautner [Wed, 23 Jul 2014 19:19:38 +0000 (19:19 +0000)]
am
41505285: am
59f55203: Disable back button goes to recents behavior
* commit '
41505285136f349f281df0dade79f17b353971ff':
Disable back button goes to recents behavior
Craig Mautner [Wed, 23 Jul 2014 19:15:30 +0000 (19:15 +0000)]
am
59f55203: Disable back button goes to recents behavior
* commit '
59f55203974be24596d2c2c4ca441e61a9ede963':
Disable back button goes to recents behavior
Eino-Ville Talvala [Tue, 15 Jul 2014 17:31:54 +0000 (10:31 -0700)]
Camera2: Fix callback operation
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
semantics
Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
Prerepa Viswanadham [Wed, 23 Jul 2014 19:05:44 +0000 (19:05 +0000)]
am
bdbd1b3b: am
244c2f47: Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
* commit '
bdbd1b3b6ba06e2c52ce375e4221df4853e88319':
Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
Ye Wen [Wed, 23 Jul 2014 19:05:41 +0000 (19:05 +0000)]
am
dbbd116c: am
a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
* commit '
dbbd116c9d1e67b67213e2be14f0198cf6e1b524':
Infer legacy network type for ConnectivityManager.requestNetwork
Prerepa Viswanadham [Wed, 23 Jul 2014 18:59:35 +0000 (18:59 +0000)]
am
244c2f47: Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
* commit '
244c2f47afa12e0d30918522ef8577f4a931623b':
Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
Ye Wen [Wed, 23 Jul 2014 18:59:30 +0000 (18:59 +0000)]
am
a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
* commit '
a7d1baac96f73a64aa6e76a494724c2ed29a5456':
Infer legacy network type for ConnectivityManager.requestNetwork
Craig Mautner [Wed, 23 Jul 2014 17:42:18 +0000 (10:42 -0700)]
Disable back button goes to recents behavior
Using a static final boolean to do this so if policy is changed it
can be enabled easily.
Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.
Fixes bug
16512561.
Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
Jason Monk [Wed, 23 Jul 2014 18:56:27 +0000 (18:56 +0000)]
am
01f4253b: am
7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev
* commit '
01f4253b2d2d6e8e198f0adc57c9eb73ce8c136f':
Make the 'locked' lock task not lock keyguard on exit
RoboErik [Wed, 23 Jul 2014 20:44:56 +0000 (20:44 +0000)]
Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
RoboErik [Wed, 23 Jul 2014 20:25:02 +0000 (13:25 -0700)]
Return appropriately scaled artwork to RemoteController
RemoteController has an api to set the artwork size. This adds compatibility
code to do the exclusion or scaling of artwork to be consistent with old APIs.
bug:
15618171
Change-Id: I8cc51750c03219d42d5f543419f8b46f9eb5b833
Yao Chen [Wed, 23 Jul 2014 20:25:08 +0000 (20:25 +0000)]
Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
Yao Chen [Wed, 23 Jul 2014 17:54:29 +0000 (10:54 -0700)]
various fixes in MediaBrowserItem and MediaBrowserService
Change-Id: I57f2a6728eea14ff6243fd68d21886599a5a12f4
Gabriel Peal [Wed, 23 Jul 2014 20:02:19 +0000 (20:02 +0000)]
Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* changes:
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
Tao Bai [Wed, 23 Jul 2014 19:19:52 +0000 (19:19 +0000)]
Merge "WebView permission change" into lmp-dev
Tao Bai [Wed, 16 Jul 2014 20:54:15 +0000 (13:54 -0700)]
WebView permission change
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think
BUG:
15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
Prerepa Viswanadham [Wed, 23 Jul 2014 00:00:09 +0000 (17:00 -0700)]
Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
Jason Monk [Wed, 23 Jul 2014 18:51:26 +0000 (18:51 +0000)]
am
7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev
* commit '
7143b71c9daf0ed4e73eabd190a445f14d9eafc0':
Make the 'locked' lock task not lock keyguard on exit
Robert Greenwalt [Wed, 23 Jul 2014 19:45:20 +0000 (19:45 +0000)]
Merge "Reenable logging." into lmp-dev
Robert Greenwalt [Wed, 23 Jul 2014 19:42:47 +0000 (12:42 -0700)]
Reenable logging.
ConnectivityService has been rewritten for L and is in a stabilizing period.
We need the logging to track down bugs people report.
Restoring to Pre-L conditions.
If there's excess logging please report it - it probably indicates a bug.
Change-Id: I7baf891e3bf12e1545afeb92b8d5af0b01e12a7b
Wei Wang [Wed, 23 Jul 2014 18:50:00 +0000 (18:50 +0000)]
am
03aeeb29: am
6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev
* commit '
03aeeb294657a616710aca3ff8e1ca5080a1b67b':
Fix parcel issues with empty service uuid. Added tests.
Wei Wang [Wed, 23 Jul 2014 18:47:10 +0000 (18:47 +0000)]
am
6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev
* commit '
6d630c7575f9e33632acf398201ae4226ce800ed':
Fix parcel issues with empty service uuid. Added tests.
Gabriel Peal [Tue, 22 Jul 2014 16:39:06 +0000 (09:39 -0700)]
Added Action to PlaybackState
Added the ability to discover MediaBrowsers
Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
Gabriel Peal [Tue, 22 Jul 2014 16:39:06 +0000 (09:39 -0700)]
Added QueueState, playUri, and playFromSearch.
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls
Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
Jason Monk [Wed, 23 Jul 2014 18:44:53 +0000 (18:44 +0000)]
Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev
Alan Viverette [Wed, 23 Jul 2014 18:33:37 +0000 (18:33 +0000)]
am
b1e9a890: am
cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev
* commit '
b1e9a890a167cc63aa5bd4656a6643bb41addc73':
Ensure ripple mask gets updated in public constructor
Alan Viverette [Wed, 23 Jul 2014 18:30:36 +0000 (18:30 +0000)]
am
cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev
* commit '
cc379868058f453946f03c7c0fdb89bd2076c8d4':
Ensure ripple mask gets updated in public constructor
Jeff Davidson [Wed, 23 Jul 2014 18:28:08 +0000 (18:28 +0000)]
am
fb28414b: am
d0868c89: Implement VpnService.setBlocking().
* commit '
fb28414b5a1d32e023c74c755fa0283290414606':
Implement VpnService.setBlocking().
Jeff Davidson [Wed, 23 Jul 2014 18:23:50 +0000 (18:23 +0000)]
am
d0868c89: Implement VpnService.setBlocking().
* commit '
d0868c89eac6df2adbbdcdee7fe24dba943736a7':
Implement VpnService.setBlocking().
Brian Attwell [Wed, 23 Jul 2014 18:20:03 +0000 (18:20 +0000)]
am
1a038e57: am
41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact
* commit '
1a038e572ec718b2364650144dc6d6969a4a2410':
Add PICK_JOIN_CONTACT_ACTION action contact
Chris Craik [Wed, 23 Jul 2014 18:19:58 +0000 (18:19 +0000)]
am
97d572ec: am
f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev
* commit '
97d572ecb4804fc764a2bc99d0a0f6dddfe6fbd8':
Build layer damage bounds for shadows
Jeff Davidson [Wed, 23 Jul 2014 17:14:53 +0000 (10:14 -0700)]
Implement VpnService.setBlocking().
Bug:
12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
Brian Attwell [Wed, 23 Jul 2014 18:15:55 +0000 (18:15 +0000)]
am
41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact
* commit '
41b62ac75082d823c05571e7d04c8cc5453218c9':
Add PICK_JOIN_CONTACT_ACTION action contact
Chris Craik [Wed, 23 Jul 2014 18:15:51 +0000 (18:15 +0000)]
am
f2ecf428: Merge "Build layer damage bounds for shadows" into lmp-dev
* commit '
f2ecf428a0311d0b07ae35d743f5165384812547':
Build layer damage bounds for shadows
Brian Attwell [Wed, 23 Jul 2014 03:53:59 +0000 (20:53 -0700)]
Add PICK_JOIN_CONTACT_ACTION action contact
This ContactsContract change is needed by ag/509090
Bug:
16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
Ye Wen [Wed, 23 Jul 2014 18:53:02 +0000 (18:53 +0000)]
Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
Ye Wen [Mon, 21 Jul 2014 21:19:01 +0000 (14:19 -0700)]
Infer legacy network type for ConnectivityManager.requestNetwork
ConnectivityManager.requestNetwork pass TYPE_NONE to
sendRequestForNetwork which prevents it from being used with legacy API
requestRouteToHostAddress. This CL infers the legacy network type
automatically from the network capabilities.
b/
16324360
Change-Id: I591d38f875f42f56e8cfc157db2069c9eee0ee26
Jason Monk [Wed, 23 Jul 2014 17:30:27 +0000 (13:30 -0400)]
Make the 'locked' lock task not lock keyguard on exit
While here also fix mIsLockTaskLocked to actually be set to a value
so that it can be used.
Bug:
16347391
Change-Id: I27416f4787b28d19d84f895889eea1d3202c1759
Svet Ganov [Wed, 23 Jul 2014 17:20:08 +0000 (17:20 +0000)]
am
5cc27606: am
f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev
* commit '
5cc27606f41f95810c8e7ce4e7855f4c4fae409c':
Adding shell commands for grant/revoke of bind app widget permisison.
RoboErik [Wed, 23 Jul 2014 17:20:01 +0000 (17:20 +0000)]
am
67430c74: am
80380f82: Switch Session APIs over to AudioAttributes
* commit '
67430c74d436e58d92b0d53ffdca1de5ded20c58':
Switch Session APIs over to AudioAttributes
Svet Ganov [Wed, 23 Jul 2014 17:15:35 +0000 (17:15 +0000)]
am
f4348489: Merge "Adding shell commands for grant/revoke of bind app widget permisison." into lmp-dev
* commit '
f4348489228c244578719b20bc3d12317761378f':
Adding shell commands for grant/revoke of bind app widget permisison.
RoboErik [Wed, 23 Jul 2014 17:15:32 +0000 (17:15 +0000)]
am
80380f82: Switch Session APIs over to AudioAttributes
* commit '
80380f827a2147d436494b66193b7d59763de25b':
Switch Session APIs over to AudioAttributes
Dianne Hackborn [Wed, 23 Jul 2014 17:12:01 +0000 (17:12 +0000)]
am
9566ecd9: am
79399931: Merge "Fix issue #
16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev
* commit '
9566ecd9fbac848ba576282fd9ee315c33b28f0e':
Fix issue #
16467284: Make noteStartVideo and noteStartAudio nesting
Sander Alewijnse [Wed, 23 Jul 2014 17:11:57 +0000 (17:11 +0000)]
am
ce1088a6: am
fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev
* commit '
ce1088a641b0027df04e3388a73423294262d547':
Add Device Policy API to disable screen capture.
RoboErik [Mon, 21 Jul 2014 19:44:53 +0000 (12:44 -0700)]
Switch Session APIs over to AudioAttributes
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.
bug:
16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
Dianne Hackborn [Wed, 23 Jul 2014 17:07:35 +0000 (17:07 +0000)]
am
79399931: Merge "Fix issue #
16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev
* commit '
7939993150214d6d717d46246c33d43652ec806a':
Fix issue #
16467284: Make noteStartVideo and noteStartAudio nesting
Sander Alewijnse [Wed, 23 Jul 2014 17:07:32 +0000 (17:07 +0000)]
am
fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev
* commit '
fcb490a2d3b1f28a375e40b44201882ff171bfa5':
Add Device Policy API to disable screen capture.
Jeff Davidson [Wed, 23 Jul 2014 16:55:20 +0000 (16:55 +0000)]
am
dfe72ae3: am
69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev
* commit '
dfe72ae322567b6ac7be6644ea0811beec0a4d4b':
Expose NETWORK_SCORE_SERVICE as @SystemApi.
Jeff Davidson [Wed, 23 Jul 2014 16:55:16 +0000 (16:55 +0000)]
am
8410ced8: am
607281ff: Delete most network scorer tests from coretests.
* commit '
8410ced8134bc81ea726f075a70ae6556b8ca3fe':
Delete most network scorer tests from coretests.
Jeff Davidson [Wed, 23 Jul 2014 16:46:23 +0000 (16:46 +0000)]
am
69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev
* commit '
69c976c665ddde192157cbf9a4cc31df83af1c75':
Expose NETWORK_SCORE_SERVICE as @SystemApi.
Jeff Davidson [Wed, 23 Jul 2014 16:46:20 +0000 (16:46 +0000)]
am
607281ff: Delete most network scorer tests from coretests.
* commit '
607281ffc1ac13ecc3d51c52d2d0a57c33d2c358':
Delete most network scorer tests from coretests.
Jae Seo [Wed, 23 Jul 2014 16:46:13 +0000 (16:46 +0000)]
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
Jae Seo [Wed, 23 Jul 2014 16:40:47 +0000 (16:40 +0000)]
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
Jeff Davidson [Mon, 21 Jul 2014 20:57:18 +0000 (13:57 -0700)]
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
Jungshik Jang [Wed, 23 Jul 2014 14:38:55 +0000 (14:38 +0000)]
am
a6501c7a: am
0062e49d: Merge "Fix unknown tag @throw" into lmp-dev
* commit '
a6501c7aeeeba1d93948d226c7b83d5f757e9297':
Fix unknown tag @throw
Jungshik Jang [Wed, 23 Jul 2014 14:34:51 +0000 (14:34 +0000)]
am
0062e49d: Merge "Fix unknown tag @throw" into lmp-dev
* commit '
0062e49d753903cf440353085f2ed31a17c23ab0':
Fix unknown tag @throw
Chris Wren [Wed, 23 Jul 2014 14:28:54 +0000 (14:28 +0000)]
am
43387c0c: am
eb6f138b: Honor the sort and group keys for notification ranking.
* commit '
43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
Honor the sort and group keys for notification ranking.
Chris Wren [Wed, 23 Jul 2014 14:23:46 +0000 (14:23 +0000)]
am
eb6f138b: Honor the sort and group keys for notification ranking.
* commit '
eb6f138b8156f292acca1026a9df3b9132aea63e':
Honor the sort and group keys for notification ranking.
Chris Wren [Wed, 23 Jul 2014 13:11:45 +0000 (13:11 +0000)]
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
Chris Wren [Wed, 23 Jul 2014 12:59:09 +0000 (12:59 +0000)]
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."
Santos Cordon [Wed, 23 Jul 2014 12:59:05 +0000 (12:59 +0000)]
am
22900e4e: am
ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev
* commit '
22900e4e8dbee3d02bca1fc3bed5f7a7205596e3':
Change display Strings to CharSequence (1/3)
Chris Wren [Wed, 23 Jul 2014 12:59:01 +0000 (12:59 +0000)]
am
14d65e68: am
df09d4c3: Honor the sort and group keys for notification ranking.
* commit '
14d65e68ad753c2384785061ea6e470a995dcab6':
Honor the sort and group keys for notification ranking.
Narayan Kamath [Wed, 23 Jul 2014 12:58:55 +0000 (12:58 +0000)]
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.
Narayan Kamath [Wed, 23 Jul 2014 12:58:51 +0000 (12:58 +0000)]
am
0c479058: am
c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev
* commit '
0c479058c2660b746f9ce19659d6db6b328af13a':
Remove copy of Locale.adjustLanguageCode.
Bryan Mawhinney [Wed, 23 Jul 2014 12:58:47 +0000 (12:58 +0000)]
am
64ccca0d: am
d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras
* commit '
64ccca0d703bb176799216fa84e17bec352f02d3':
Store actions passed to MediaStyle.setShowActionsInCompactView in extras
Nicolas Prevot [Wed, 23 Jul 2014 12:58:43 +0000 (12:58 +0000)]
am
b5b6f33e: am
ea6f0c52: Fixing cross-user content.
* commit '
b5b6f33e777a62fc400e21ab73c2a78ba1c974e9':
Fixing cross-user content.
Jungshik Jang [Wed, 23 Jul 2014 12:58:38 +0000 (12:58 +0000)]
am
c1d403f6: am
da251030: Add startTimerRecording api to IHdmiControlService.
* commit '
c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
Add startTimerRecording api to IHdmiControlService.
Youngsang Cho [Wed, 23 Jul 2014 12:58:34 +0000 (12:58 +0000)]
am
5b0fca67: am
76f8d671: Block logging watched histories for passthrough inputs
* commit '
5b0fca67b75204fb886e541719e6f049ed932dc5':
Block logging watched histories for passthrough inputs
Youngsang Cho [Wed, 23 Jul 2014 12:58:30 +0000 (12:58 +0000)]
am
7ab36b39: am
02d93880: Enable customization of TvInputInfo icon/label
* commit '
7ab36b39b66c63f2ef2a1a0a113413fb5cbdde5c':
Enable customization of TvInputInfo icon/label
Chris Wren [Wed, 23 Jul 2014 12:51:42 +0000 (12:51 +0000)]
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."
Santos Cordon [Wed, 23 Jul 2014 12:51:37 +0000 (12:51 +0000)]
am
ca8e44fb: Merge "Change display Strings to CharSequence (1/3)" into lmp-dev
* commit '
ca8e44fb5ae5eb9206d9d61408b90ade31d33e8f':
Change display Strings to CharSequence (1/3)
Chris Wren [Wed, 23 Jul 2014 12:51:34 +0000 (12:51 +0000)]
am
df09d4c3: Honor the sort and group keys for notification ranking.
* commit '
df09d4c348f9f2aea10391b27d157d8b71a9e189':
Honor the sort and group keys for notification ranking.
Narayan Kamath [Wed, 23 Jul 2014 12:51:26 +0000 (12:51 +0000)]
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.
Narayan Kamath [Wed, 23 Jul 2014 12:51:22 +0000 (12:51 +0000)]
am
c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev
* commit '
c0fb18a215467be0f5bdc25fb6d5612349bc989b':
Remove copy of Locale.adjustLanguageCode.
Bryan Mawhinney [Wed, 23 Jul 2014 12:51:06 +0000 (12:51 +0000)]
am
d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras
* commit '
d5d3525a92fd42238b03635d2389509feee88389':
Store actions passed to MediaStyle.setShowActionsInCompactView in extras
Nicolas Prevot [Wed, 23 Jul 2014 12:51:02 +0000 (12:51 +0000)]
am
ea6f0c52: Fixing cross-user content.
* commit '
ea6f0c5248e4026da863f85ead9a7ee7062c4174':
Fixing cross-user content.
Jungshik Jang [Wed, 23 Jul 2014 12:50:58 +0000 (12:50 +0000)]
am
da251030: Add startTimerRecording api to IHdmiControlService.
* commit '
da251030221ef58ebd03471aa249f7ad3000c7ff':
Add startTimerRecording api to IHdmiControlService.
Youngsang Cho [Wed, 23 Jul 2014 12:50:54 +0000 (12:50 +0000)]
am
76f8d671: Block logging watched histories for passthrough inputs
* commit '
76f8d6714a64a101e281fbe3a24c2289f9a79a8f':
Block logging watched histories for passthrough inputs
Youngsang Cho [Wed, 23 Jul 2014 12:50:49 +0000 (12:50 +0000)]
am
02d93880: Enable customization of TvInputInfo icon/label
* commit '
02d938801ae4b53cce217eadeadc15f29683f267':
Enable customization of TvInputInfo icon/label
Chris Wren [Thu, 17 Jul 2014 21:08:53 +0000 (17:08 -0400)]
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
Bryan Mawhinney [Tue, 22 Jul 2014 11:50:09 +0000 (12:50 +0100)]
Store actions passed to MediaStyle.setShowActionsInCompactView in extras
So that they can be bridged appropriately by Android Wear
Change-Id: I3a21a74991c8067ece1a04fbd0b92dd21438e0fd
Nicolas Prevot [Mon, 21 Jul 2014 15:28:21 +0000 (16:28 +0100)]
Fixing cross-user content.
Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e