137247 Commits

Author SHA1 Message Date
Robert Greenwalt
49fa8e15ba Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev 2014-06-03 01:26:19 +00:00
Jinsuk Kim
b9e60f35ef DO NOT MERGE: Added missing entries in the cec device array
Change-Id: Ibb775f47cb9fb53df0a1baf67d09d76c4cb42392
2014-06-03 10:15:39 +09:00
vandwalle
1b3718ee66 Merge "add uid and debug fields to wifiConfiguration" into lmp-preview-dev 2014-06-03 01:03:44 +00:00
Alan Viverette
840ff80962 Set starting value on ripple exit animation
Change-Id: I2eca91c02ea059591a2ee0c75c5355f0ecd5a4be
2014-06-02 18:01:38 -07:00
Alan Viverette
519bfd898c Quantum tab indicators, clean up text appearances
BUG: 14618104
Change-Id: I88d3cbde794d418f50e7700d9aa2cabd0ba51fdc
2014-06-02 17:54:57 -07:00
Dongwon Kang
a3be12a236 Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
Bug: 14628404
Change-Id: I40abf647e9d608c2c793d007fd2fe0d511535bdd
2014-06-03 09:53:05 +09:00
Winson Chung
521e7dc0a6 Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)
Change-Id: I601ee7eda22a4b5ecb2e6835d55ed6539c5cd503
2014-06-02 17:33:09 -07:00
Jae Seo
6fbe3982b0 Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev 2014-06-03 00:26:05 +00:00
Sungsoo Lim
5a26f00c84 Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev 2014-06-03 00:23:09 +00:00
vandwalle
20711c9feb add uid and debug fields to wifiConfiguration
Bug:15111865

Change-Id: I154214c08efe769495cc214cbf65f15d55d83a32
2014-06-02 17:20:05 -07:00
Alan Viverette
ad3c4a136e Fix build
Change-Id: I09c649b3385ed46956f2d784546c430298de3069
2014-06-02 17:12:58 -07:00
Sungsoo Lim
72ad7bf915 Add ClientState for handling the crash of clients.
Bug: 15054040
Change-Id: I4dd8d1c350186fe705daa20c9944bc8e4dd556c2
2014-06-03 09:09:14 +09:00
Chulwoo Lee
6abd0d801b Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev 2014-06-02 23:59:55 +00:00
Chulwoo Lee
e7bb7d6bb2 Add a way to get the class name of SetupActivity and SettingsActivity
Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.

BUG: 15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
2014-06-03 08:56:35 +09:00
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
Alan Viverette
5a4af17e27 Merge "Clean up drawable theming APIs" into lmp-preview-dev 2014-06-02 23:41:59 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
2014-06-02 16:39:04 -07:00
Robert Greenwalt
562cc54536 Rewrite startUsingNetworkFeature for new API
bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
(cherry picked from commit 09fe5e618b09965183cf53fba87c39025a19e8d1)
2014-06-02 23:29:20 +00:00
Wei Wang
ea2aaef308 Add device capability config for new BLE features(MA, scan filter).(1/3)
Fixes b/15387925.

Change-Id: Ib53e92967971b769ff9872bf11dfa10f4c9a1fd4
2014-06-02 15:58:32 -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
Adrian Roos
897752a6f7 Disable now defunct touch analysis facility - DO NOT MERGE
Bug: 15381470
Change-Id: I2ab252e4c0122d79c9a78b3df643bfd46a105cf0
2014-06-02 23:54:05 +02: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
Baligh Uddin
0d824211e0 Import translations. DO NOT MERGE
Change-Id: I026e16df073c367277f51e312bae370742dcf489
Auto-generated-cl: translation import
2014-06-02 13:01:39 -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
Baligh Uddin
b27d14cf54 Import translations. DO NOT MERGE
Change-Id: I982cb1c4dbb5dd3a2e32de388e133c85cbb1898a
Auto-generated-cl: translation import
2014-06-02 10:42:14 -07: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