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

144502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Chris Wren
dedc4a379f Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 2014-07-23 05:48:23 +00:00
Chris Wren
cf7ed58308 Revert "Honor the sort and group keys for notification ranking." 
This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189.

Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
 2014-07-23 12:41:37 +00:00
Narayan Kamath
0c434aed47 Merge "Add an internal API to get all asset locales." into lmp-dev 2014-07-23 05:48:23 +00:00
Narayan Kamath
37197df479 Add an internal API to get all asset locales. 
This will allow us to not copy paste this code verbatim into
bundled apps.

bug: 10090157

(cherry picked from commit 9e6d9d4c812d01ac07180c5d6ab64c36fb9b2aa7)

Change-Id: I34690a2b6dad51f1592f37d3c2a8c81345632c2f
 2014-07-23 11:17:30 +01:00
Narayan Kamath
4c6ce23816 Remove copy of Locale.adjustLanguageCode. 
(cherry picked from commit 1d31a5f8243fd6befb14d8a2ba25d28e006511f8)

Change-Id: I7b30a153a44dc1f99a9ddfe256b770d7305a74b7
 2014-07-23 11:09:26 +01:00
Narayan Kamath
c9e2716f7b Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 2014-07-23 05:48:23 +00:00
Youngsang Cho
008f6d4e32 Block logging watched histories for passthrough inputs 
Added a system API TvContract.isChannelUriForPassthroughTvInput

Change-Id: I933482831ae2a8b4d6000c4d16520387b5b6a13f
 2014-07-22 22:16:01 -07:00
Youngsang Cho
9d744068f9 Enable customization of TvInputInfo icon/label 
TODO: Apply builder pattern to create instances of TvInputInfo

Bug: 16166859
Change-Id: I37ef35e7e463a5ff6612f822fd784b7f299039c9
 2014-07-22 22:16:01 -07:00
Lajos Molnar
2703972fa1 am d9e091e0: am 3f52465c: MediaFormat: add KEY_TEMPORAL_LAYERING 
* commit 'd9e091e0a8920b7e22d155a500ba90864c960bec':
  MediaFormat: add KEY_TEMPORAL_LAYERING
 2014-07-23 03:47:47 +00:00
Lajos Molnar
5a25445a6c am 3f52465c: MediaFormat: add KEY_TEMPORAL_LAYERING 
* commit '3f52465ccfb9fc1e9398340f78e5b6138fd71e9b':
  MediaFormat: add KEY_TEMPORAL_LAYERING
 2014-07-23 03:43:45 +00:00
Lajos Molnar
4b902d72db MediaFormat: add KEY_TEMPORAL_LAYERING 
Bug: 14562236
Change-Id: I343d2859e48552d7372fec3b77aea868ff1bfc33
 2014-07-22 20:36:05 -07:00
John Spurlock
2f070824af am 93bb9518: am db514f4d: Shade: Don\'t clip header icons pre-expand. 
* commit '93bb95186c9ebcc1430b7353914e2e55ef67651c':
  Shade: Don't clip header icons pre-expand.
 2014-07-23 02:39:05 +00:00
John Spurlock
583554b7ed am db514f4d: Shade: Don\'t clip header icons pre-expand. 
* commit 'db514f4d0f491bf20c88d3f020eda803768c6a9e':
  Shade: Don't clip header icons pre-expand.
 2014-07-23 02:34:48 +00:00
John Spurlock
312b792421 Shade: Don't clip header icons pre-expand. 
Bug:16496619
Change-Id: I1d3a391b2203b172bd525396719b671fe5cc3784
 2014-07-22 22:28:13 -04:00
Alan Viverette
f8ddc76c96 am a6f63294: am 560faa81: Merge "Remove dialog icons" into lmp-dev 
* commit 'a6f63294f897e56591c08bed17ff7f6138dd70c0':
  Remove dialog icons
 2014-07-23 01:53:14 +00:00
Alan Viverette
3c425f74e3 am 560faa81: Merge "Remove dialog icons" into lmp-dev 
* commit '560faa81b46cc727f08ea9267d89dba918b06e93':
  Remove dialog icons
 2014-07-23 01:45:35 +00:00
Dianne Hackborn
ac725d37b8 am 2c89b4b3: am dc4a88f7: Merge "Further fix on issue #16013164" into lmp-dev 
* commit '2c89b4b3ad6a9c88d5039296839b885843401d01':
  Further fix on issue #16013164
 2014-07-23 01:35:43 +00:00
Dianne Hackborn
f9e523f4af am cf24cfb1: am 7aeb54cf: Merge "Finish toast app op." into lmp-dev 
* commit 'cf24cfb1a1daf045601b1e13b0012a59b66f6572':
  Finish toast app op.
 2014-07-23 01:35:38 +00:00
Dianne Hackborn
86848b9f11 am aacb2f77: am 4575f2a9: Merge "Use foreground broadcast to get device admin msg." into lmp-dev 
* commit 'aacb2f778d71f2cd2b75e43b66f2de7ffc5d92c9':
  Use foreground broadcast to get device admin msg.
 2014-07-23 01:35:34 +00:00
Dianne Hackborn
eb477581d6 am dc4a88f7: Merge "Further fix on issue #16013164" into lmp-dev 
* commit 'dc4a88f7fbf2d0f887ceced4d8f41f6ad9e8bfdf':
  Further fix on issue #16013164
 2014-07-23 01:31:38 +00:00
Adam Lesinski
65e91e5698 am c3b343ec: am f0ba6878: Merge "Add test UsageStats App" into lmp-dev 
* commit 'c3b343ec2c02c94326fe0264d9829bcdf31fb34a':
  Add test UsageStats App
 2014-07-23 01:31:35 +00:00