137177 Commits

Author SHA1 Message Date
Alan Viverette
560ad617cb Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev 2014-06-03 21:11:27 +00:00
Jorim Jaggi
e42c72e1b2 Merge "Move owner info to main lockscreen." into lmp-preview-dev 2014-06-03 20:46:39 +00:00
Jorim Jaggi
959ab56ba2 Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev 2014-06-03 20:42:19 +00:00
Jorim Jaggi
b9d6079120 Fix invalid Keyguard state with encrypted devices.
Bug: 15389720
Change-Id: I0a18e78043e5c08f40cf3288abc07f75ea6261a0
2014-06-03 22:35:57 +02:00
Chris Wren
aaa58d1c4a Handle Zen Mode computations correctly for updated notifications.
Updates to intercepted notifications come in through addNotificatiom
instead of updateNotification, because the intercepted notifications
are not in mNotificationData.

If an update causes a notification to surface, we need to notice and
remove it from the synthetic notification.  However, addNotification
is called from within InterceptedNotifications inside loops over
mIntercepted, and we cannot remove items from mIntercepted while
looping, so we split addNotification into two parts, one part is only
used by InterceptedNotifications to unconditionally surface previously
intercepted notifications.

Bug: 15389069
Change-Id: I7b0952a337f15d4009e3e61360344012345eac95
2014-06-03 15:56:28 -04:00
Chris Wren
c936ea393f Merge "Apply Zen Mode later, after we've found the old record." into lmp-preview-dev 2014-06-03 19:54:09 +00:00
Alan Viverette
b6f9152b70 Fix drawable cache, add quantum assets to preload list
BUG: 15409352
Change-Id: Idb18fd99dc4229aace9082d6e26c88faf81d15bf
2014-06-03 12:52:25 -07:00
Jorim Jaggi
a52c68772d Merge "Animate unlock icon while unlocking." into lmp-preview-dev 2014-06-03 19:25:56 +00:00
Chris Wren
52eba54eca Apply Zen Mode later, after we've found the old record.
Copy the extracted signales from the previous record to the new
record.  Do this before the signal extractors are called so that code
can decide what to do with the information.

Bug: 15383769
Change-Id: Ifa24fa0e4380f08979c2126b63d29794aa50a787
2014-06-03 14:58:51 -04:00
Jorim Jaggi
93afa1dba6 Move owner info to main lockscreen.
Bug: 14307636
Bug: 15283575
Change-Id: I8cba9c0e78f825920aca1468d965e8da9b402da8
2014-06-03 20:57:35 +02:00
Jorim Jaggi
4327e2fbcd Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev 2014-06-03 18:22:05 +00:00
Jorim Jaggi
a1b1c7a44a Fix fake status bar not visible in SHADE_LOCKED state.
Bug: 15393127
Change-Id: I535b275acd3070121c03425bd8d7c768f0a995f2
2014-06-03 20:19:38 +02:00
Alan Viverette
40646c5c6a Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev 2014-06-03 18:05:05 +00:00
Alan Viverette
7a98f74438 Fix NPE when ripples are canceled due to visibility change
BUG: 15406248
Change-Id: I63ce42fef8e1614372ee4a82e45eb15e8bbe1fe3
2014-06-03 10:13:22 -07:00
Winson Chung
6b264f6e7b Merge "Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)" into lmp-preview-dev 2014-06-03 16:19:58 +00:00
Jorim Jaggi
8dd95e03f8 Animate unlock icon while unlocking.
When the user reaches the threshold such that the gesture is accepted
as an unlock, the icon scales a bit and gets fully opaque. When the
user flings, it gets even larger and fades out.

Bug: 15163546
Change-Id: Icd963aa8f7268712f239b204cdfa61ebc2baf4d0
2014-06-03 16:21:40 +02:00
Robert Greenwalt
32aa65a112 Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
(cherry picked from commit 16fe1c18289de200d2249e51db8c0986619f487b)
2014-06-03 14:00:56 +00:00
Adrian Roos
18ea893a23 Ensure trust agents are only provided by platform packages
Prevents the TrustManagerService from binding to any non-platform
trust agents and updates the SampleTrustAgent to use the new
permission.

Bug: 15287044
Change-Id: I38c3deebd5ad359075e68f52d19417bab5ab43db
2014-06-03 15:49:19 +02:00
Jorim Jaggi
93a2bb2063 Improve hint animations.
Show the hint text longer so that users have enough time to read it,
also "highlight" the corresponding icon by making it fully opaque
during the gesture.

Bug: 15189049
Change-Id: Ie0429752b63bae41bb6992778ebb3bd5678f9676
2014-06-03 15:31:47 +02:00
Jorim Jaggi
b3f0a2ff00 Hint for phone and camera.
Bug: 15189049
Bug: 15126962
Change-Id: Ie28fc8202ace4af56542201d168572ef6ad78d19
2014-06-03 15:31:19 +02:00
Jorim Jaggi
282a615263 Hide phone/camera affordance when unlocking.
Bug: 15163546
Change-Id: If9f3e270bb3f5473abd687061a0c3f6faf2bf3b0
2014-06-03 14:59:41 +02:00
Adrian Roos
af12d0aff0 Merge "Disable now defunct touch analysis facility - DO NOT MERGE" into lmp-preview-dev 2014-06-03 10:45:15 +00:00
Jungshik Jang
c3e9b45da0 Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev 2014-06-03 04:14:49 +00:00
Evan Charlton
faa3ff9ba8 Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev 2014-06-03 03:47:06 +00:00
Wei Wang
6510d43d07 Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev 2014-06-03 03:03:04 +00:00
Robert Greenwalt
1062171090 Merge "Refactor NetworkFactory." into lmp-preview-dev 2014-06-03 02:59:22 +00:00
Dongwon Kang
7b2ae34b97 Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev 2014-06-03 02:31:28 +00:00
Eric Laurent
b4e0909fc4 AudioManager: fix AudioPort gain query
Fix bug causing AudioPort.gain(int) to always return null.

Also removed debug log from AudioManager.

Bug: 14815883.
Change-Id: Ie65bab233ec8b4d974061e11ec5b8f0de18275d9
2014-06-02 19:22:48 -07:00
vandwalle
0aa5420504 handle removal of self added configurations
Change-Id: Ib2891ac38a4a876b0cd4f198cf26198b9fc12909
(cherry picked from commit 23fea6a042073e3cb1b0e74be5b0d096916ab6b8)
2014-06-03 01:31:50 +00:00
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
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