136972 Commits

Author SHA1 Message Date
Jae Seo
bd23fa0ba1 TvContract: Address the feedback from the API review
This change addresses the following comments from the council:
- Provider authority should be "android.media.tv"
- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to
  indicate data is internal to the provider that inserted it, and should
  not be decoded by other apps. It would be nice to restrict read access
  to this column, but not essential.
- Hide COLUMN_LOCKED since implementation isn't defined yet, also
  questions about how it interacts with Unicorn.
- Fix typo in ORIGINAL_NETWORK documentation.
- All provider MIME types need to be changed to follow platform
  conventions: "vnd.android.cursor.dir/channel",
  "vnd.android.cursor.dir/program", etc. (Notice singular tense and no
  package prefixes since they're part of the platform API.)
- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along
  with docs update, for the same reasons as above.
- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs
  to indicate it's a recommended maximum length, not a hard cap.
- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE
  (from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android
  standard). Define a subclass with the Android canonical genres, which
  are simple strings that are comma-separated when inserted into
  COLUMN_CANONICAL_GENRE.

Bug: 15345342
Change-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a
2014-06-02 16:44:37 -07:00
Dianne Hackborn
0bec638839 Merge "Some battery stats history fixes." into lmp-preview-dev 2014-06-02 22:57:41 +00:00
Raph Levien
596f0b1a03 Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev 2014-06-02 22:54:58 +00:00
George Mount
cdd5c8f34b Merge "Delay sending shared element position until after layout." into lmp-preview-dev 2014-06-02 22:42:45 +00:00
Adam Powell
08c06495cc Merge "Add an internal method for setting optical insets." into lmp-preview-dev 2014-06-02 21:36:55 +00:00
Jorim Jaggi
03bce432aa Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev 2014-06-02 21:35:04 +00:00
Jorim Jaggi
457cc35608 Hide header when notifications collide with it on Keyguard.
Bug: 15163546
Change-Id: If4f39786916df75537959a8104823353c475448f
2014-06-02 21:34:33 +00:00
Adam Powell
dbb06e0c8c Add an internal method for setting optical insets.
This will allow views to calculate their own optical insets
e.g. during measurement. Candidate for public API down the road once
it proves itself for framework views.

Change-Id: I098d7b7b52e5aaf7eccc8ef34d79791d127d8c77
2014-06-02 14:24:47 -07:00
Raph Levien
44e3da3c28 Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev 2014-06-02 21:17:49 +00:00
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Fabrice Di Meglio
b75a69f9b3 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:50:43 +00:00
Fabrice Di Meglio
4ec0038243 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:49:37 +00:00
Craig Mautner
481acb86e4 Merge "Compare task userId with userId profiles." into lmp-preview-dev 2014-06-02 20:40:16 +00:00
George Mount
d265bd7446 Delay sending shared element position until after layout.
Bug 15380396

Also updated fade duration to 300ms now that shared element
transition can take place before fade.

Change-Id: I9053615c83b9e0938b015645de0eb6c1534cbb34
2014-06-02 13:39:14 -07:00
Raph Levien
a0cba0fde3 Check for NULL on TypefaceImpl unref
It's possible for a TypefaceImpl to contain a null pointer, which was
causing crashes on unref. This patch just checks for NULL.

Fixes bug 15104801 "Aviate Launcher crashes on startup - Hammerhead L
AAV49B"

Change-Id: Idf9f176c54bf81ff3daacc0b33e95aa9d8bbe57f
2014-06-02 13:37:34 -07:00
Vinit Deshpande
d5d9e73a1a Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev 2014-06-02 20:00:12 +00:00
Dianne Hackborn
fc0641340f Some battery stats history fixes.
- Now the full wake history uses the history tag if it can.
  Hopefully this will still result in a consistent history,
  since that isn't really want the tag is for...  but the
  current implementation in places will probably make this work.

- Possibly fix a bug with inconsistent state between partial
  history snapshots: after a snapshot is printed, don't allow
  any more batching into the most recent history entry, so the
  next snapshot will not miss anything that might get placed
  into it soon after.

Also rework command line arguments for enable/disable to make these
commands instead of options.

Change-Id: Ia33445cad1538bf8df549cef284f1e736efbc079
2014-06-02 12:42:12 -07:00
John Spurlock
66268f5d32 Merge "Update global actions bug report item." into lmp-preview-dev 2014-06-02 19:17:35 +00:00
John Spurlock
887aa0024f Update global actions bug report item.
New icon, update title to match confirm dialog, new status
line for build information.

Remove redundant QS tile.

Bug:15385554
Change-Id: Idc36dc9ce1cabfa61fd8acac56dc3a70d5dc6645
2014-06-02 15:01:58 -04:00
John Reck
82e71a756e Merge "Add setStartValue to RNA" into lmp-preview-dev 2014-06-02 18:13:14 +00:00
Raph Levien
a9efb28408 Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev 2014-06-02 18:04:45 +00:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
John Reck
c6b3264e16 Add setStartValue to RNA
Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
2014-06-02 11:00:09 -07:00
Raph Levien
d573794d83 Support fallbacks for custom typefaces (Minikin)
This patch adds the fallback font list to custom typefaces created from
files and assets, as well as those created by name. This is a fix for
the deskclock half of bug 15139067 "Centered text isn't working".

Change-Id: I0cc60951953dfb73817a98ddfee5713f0387ee90
2014-06-02 10:56:23 -07:00
Adrian Roos
e205192c72 Merge "Fix keyguard camera logic" into lmp-preview-dev 2014-06-02 17:48:07 +00:00
Alan Viverette
08847c8344 Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev 2014-06-02 17:36:50 +00:00
Alan Viverette
076aabda48 Merge "Fix default GridView list selector" into lmp-preview-dev 2014-06-02 17:36:01 +00:00
Adrian Roos
a06905b8f7 Fix keyguard camera logic
Starts non-secure camera if possible and hides camera if
it is not available.

Bug: 14384051
Change-Id: Ib0b93562bb22eb543c054adaf8f7a211862f480a
2014-06-02 19:32:29 +02:00
Santos Cordon
a6701df92a Merge "Add necessary APIs to support conference calling." into lmp-preview-dev 2014-06-02 17:21:04 +00:00
Craig Mautner
e0d50cc15b Compare task userId with userId profiles.
Change comparison of Task.mUserId from comparing with only the
current user id to comparing with all current profile user ids.

Fixes bug 14930145.

Change-Id: Ibbae08da6f4eaa31b171becdd8957293758f527b
2014-06-02 10:11:53 -07:00
RoboErik
e78755e180 Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev 2014-06-02 17:10:07 +00:00
Roozbeh Pournader
a5fea19536 Revert ascent/descent/lineGap of Roboto to Roboto v1 values
Everything else is left intact to minimize side effects.

Bug: 15309595, 15330620
Change-Id: I7f10bc093423132b037403aa3abd9304d788f32e
2014-06-02 16:45:58 +00:00
Eric Laurent
ddc93ce343 AudioManager: do not mandate a looper
Having a listener for audio port updates is not mandatory.
do not throw an excepion when AudioManager is contructed
from a thread without looper.

Bug: 15368707.
Change-Id: If5ce54bf4efdff8b785098649fa1cd0564861e1e
2014-06-02 09:16:02 -07:00
Jorim Jaggi
58136d0211 Merge "Implement unlock hint." into lmp-preview-dev 2014-06-02 13:36:42 +00:00
Jorim Jaggi
9012958742 Implement unlock hint.
Before, users didn't have any clue how to unlock their phone. Now
they have. Also, a tap now dismisses the notification shade in the
unlocked state.

Bug: 14080971
Bug: 15189435
Bug: 15282191
Bug: 15126962

Change-Id: I779344b043b4415809dd98217b7cb9ff6d57fa3e
2014-06-02 15:35:54 +02:00
Jungshik Jang
becab9a7db Merge "DO NOT MERGE: Start Device Discovery after logical address allocation." into lmp-preview-dev 2014-06-02 04:38:05 +00:00
Jungshik Jang
11969e8266 Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:46 +00:00
Jungshik Jang
9b4d25a8c5 Merge "DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:31 +00:00
Jungshik Jang
9a4e0f1205 Merge "DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message" into lmp-preview-dev 2014-06-02 04:36:41 +00:00
Jungshik Jang
efc52b08c5 Merge "DO NOT MERGE: Dispatch incoming CEC messages to feature actions" into lmp-preview-dev 2014-06-02 04:36:32 +00:00
Jungshik Jang
ae8ef37c90 Merge "DO NOT MERGE: Implement device discovery sequence." into lmp-preview-dev 2014-06-02 04:36:16 +00:00
Jungshik Jang
9bb6fbb743 Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev 2014-06-02 04:35:58 +00:00
Jungshik Jang
1dcef4f9cd Merge "DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API" into lmp-preview-dev 2014-06-02 04:35:45 +00:00
Jungshik Jang
37554062ed Merge "DO NOT MERGE: Add cec message handler to hdmi cec jni implementation" into lmp-preview-dev 2014-06-02 04:35:35 +00:00
Jungshik Jang
dc6adf5c62 Merge "DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation" into lmp-preview-dev 2014-06-02 04:35:21 +00:00
Jungshik Jang
15bbf99a52 Merge "DO NOT MERGE: Hook up the CEC playback API to service internal logic." into lmp-preview-dev 2014-06-02 04:34:56 +00:00
Jungshik Jang
f7ecc88b81 Merge "DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice" into lmp-preview-dev 2014-06-02 04:34:36 +00:00
Jungshik Jang
a8b57081f8 Merge "DO NOT MERGE: Implement <Polling Message>." into lmp-preview-dev 2014-06-02 04:34:19 +00:00
Jungshik Jang
5a0d97b1c2 Merge "DO NOT MERGE: Add the constants for the callback result of SendCecCommand()." into lmp-preview-dev 2014-06-02 04:34:02 +00:00
Jungshik Jang
3a551cb536 Merge "DO NOT MERGE: CEC Initialization per device type" into lmp-preview-dev 2014-06-02 04:33:50 +00:00