137948 Commits

Author SHA1 Message Date
Robert Greenwalt
55691b8cc7 Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
(cherry picked from commit 9a17b9c5a256cb4bb14821c5ee89b03b99c045e8)
2014-06-03 01:26:48 +00:00
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
Robert Greenwalt
9e32be5d26 Merge "Refactor NetworkFactory." 2014-06-03 01:11:00 +00: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
Yohei Yukawa
083a3e6151 Merge "Reenable DynamicRotationList for language-switching-aware IMEs" 2014-06-03 00:51:32 +00: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
ztenghui
4d24caf1de Add the tree hierarchy for the group
bug:15288554

Change-Id: I7caedb8466d078a0d9a6148e00d02eded4a4d234
2014-06-02 17:18:10 -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
Yuhao Zheng
cfdecb3b91 Merge "WifiService and WifiPasspointService hook up" 2014-06-02 23:54:11 +00:00
Yuhao Zheng
daa618e3cd WifiService and WifiPasspointService hook up
- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase

Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
2014-06-02 16:48:37 -07: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
John Reck
84a4c887a0 Remove GLRenderer
Change-Id: I180286417c1a354fc7eb1eadb1884ac6add0795c
2014-06-02 16:33:52 -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
Jinsuk Kim
d79b39220d Merge "Added missing entries in the cec device array" 2014-06-02 23:24:56 +00:00
Robert Greenwalt
3192dec321 Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
2014-06-02 16:19:08 -07:00
Robert Greenwalt
8f3799867d Merge "Rewrite startUsingNetworkFeature for new API" 2014-06-02 23:12:29 +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
John Reck
982e28cafd Merge "Cleanup" 2014-06-02 22:44:50 +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
John Reck
ce444ca400 Cleanup
Change-Id: Ie366390272724a2c1dfda99b0e85806b7a612744
2014-06-02 15:12:36 -07:00
Fabrice Di Meglio
b3d5856e68 am f3c294df: Merge "Code cleaning" into lmp-preview-dev
* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning
2014-06-02 22:10:36 +00:00
Fabrice Di Meglio
47297e8f82 am 8dead81f: Merge "Code cleaning" into lmp-preview-dev
* commit '8dead81f3b1548d0d3f84a585b389baf8d415e99':
  Code cleaning
2014-06-02 22:10:31 +00:00
Craig Mautner
8d2a604ce4 am 39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev
* commit '39317b9742cf796557583f6678a7443a991414f7':
  Compare task userId with userId profiles.
2014-06-02 22:10:30 +00:00
Vinit Deshpande
c638a61d99 am 357a441e: (-s ours) Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev
* commit '357a441e5be26a642238e2fd13e88f35f6e25a65':
  DO NOT MERGE: Accomoditing API Review feedback for WifiScanner
2014-06-02 22:10:30 +00:00
John Spurlock
fd881f8973 am 20d26282: Merge "Update global actions bug report item." into lmp-preview-dev
* commit '20d26282b31dcd7f7d258c3878f15b42211b23d0':
  Update global actions bug report item.
2014-06-02 22:10:29 +00:00
Michael Kolb
576a0d14e1 Merge "Fix circular mask" into klp-modular-dev 2014-06-02 21:57:40 +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
Adrian Roos
bba9a212a0 Remove now defunct touch analysis facility
Bug: 15381470
Change-Id: I2ab252e4c0122d79c9a78b3df643bfd46a105cf0
2014-06-02 23:48:29 +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