OSDN Git Service
Amith Yamasani [Thu, 29 Aug 2013 21:49:28 +0000 (14:49 -0700)]
am
79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev
* commit '
79a45c6f1837d5921e512213904c96660b1a80b1':
Improve Intent disambig dialog behavior
Amith Yamasani [Thu, 29 Aug 2013 21:45:04 +0000 (21:45 +0000)]
Merge "Improve Intent disambig dialog behavior" into klp-dev
Jason Sams [Thu, 29 Aug 2013 21:26:29 +0000 (14:26 -0700)]
am
6b115980: Merge "Unhide USAGE_IO_INPUT functions" into klp-dev
* commit '
6b115980483ec20cc3f7817c76dfea18c49a48f3':
Unhide USAGE_IO_INPUT functions
Jason Sams [Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)]
Merge "Unhide USAGE_IO_INPUT functions" into klp-dev
Craig Mautner [Thu, 29 Aug 2013 21:17:34 +0000 (14:17 -0700)]
am
a78d9a24: Merge "Reset activity\'s "return to home" flag on relaunch" into klp-dev
* commit '
a78d9a24d97818a6c9c071483d7854b560ecf228':
Reset activity's "return to home" flag on relaunch
Craig Mautner [Thu, 29 Aug 2013 21:14:30 +0000 (21:14 +0000)]
Merge "Reset activity's "return to home" flag on relaunch" into klp-dev
Martijn Coenen [Thu, 29 Aug 2013 21:06:22 +0000 (14:06 -0700)]
am
a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev
* commit '
a6dcf1a2d634bd8c26b6a5744fc38874bcac6dd9':
Add an API for querying HCE service selection mode.
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Add an API for querying HCE service selection mode." into klp-dev
Jason Sams [Thu, 29 Aug 2013 20:30:59 +0000 (13:30 -0700)]
Unhide USAGE_IO_INPUT functions
Change-Id: I9c1a7e5d65adee133b99b9a94729ab0b3d5a097f
Martijn Coenen [Thu, 29 Aug 2013 02:23:41 +0000 (19:23 -0700)]
Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".
Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.
Bug:
10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
Martijn Coenen [Thu, 29 Aug 2013 19:57:33 +0000 (12:57 -0700)]
am
c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit '
c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
Add requireDeviceUnlock attribute for NFC HCE.
Martijn Coenen [Thu, 29 Aug 2013 19:56:00 +0000 (19:56 +0000)]
Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
Craig Mautner [Thu, 29 Aug 2013 19:24:56 +0000 (12:24 -0700)]
Reset activity's "return to home" flag on relaunch
When relaunching an activity re-evaluate the flag that determines
whether to return to the next activity on the stack or to the home
activity upon return.
Fixes bug
10545580.
Change-Id: I5868ce1b494afffcc5afc22abe3b65aa339827bb
Igor Murashkin [Thu, 29 Aug 2013 19:03:27 +0000 (12:03 -0700)]
am
c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev
* commit '
c7d515aa219a93dc487de2a1bd762897602160c7':
media: ImageReader throws OutOfResourcesException when out of buffers
Igor Murashkin [Thu, 29 Aug 2013 18:59:10 +0000 (18:59 +0000)]
Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev
Vineeta Srivastava [Thu, 29 Aug 2013 18:44:03 +0000 (11:44 -0700)]
am
4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
* commit '
4fa9204d0f28ba3823ec9f4c8a9912a416eee397':
uicc : add config_stkNoAlphaUsrCnf to config.xml
Vineeta Srivastava [Thu, 29 Aug 2013 18:41:27 +0000 (18:41 +0000)]
Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
duho.ro [Wed, 10 Jul 2013 03:01:06 +0000 (12:01 +0900)]
uicc : add config_stkNoAlphaUsrCnf to config.xml
Per 3GPP specification 102.223,
if the alpha identifier is not provided by the UICC,
the terminal MAY give information to the user.
set to false if we need to show user confirmation
when alpha identifier is not provided by the UICC.
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
Conflicts:
core/res/res/values/config.xml
John Spurlock [Thu, 29 Aug 2013 18:05:48 +0000 (11:05 -0700)]
am
e87bc32e: Merge "More SystemUI asset updates." into klp-dev
* commit '
e87bc32e6d6991b1de72e914f268efc276837e47':
More SystemUI asset updates.
John Spurlock [Thu, 29 Aug 2013 18:03:58 +0000 (18:03 +0000)]
Merge "More SystemUI asset updates." into klp-dev
Geoffrey Borggaard [Thu, 29 Aug 2013 17:57:50 +0000 (10:57 -0700)]
am
06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev
* commit '
06b9bb0c813b3d7f93d4069b97cd255f329c4c37':
UserManagerService upgrades users on first restart.
Isaac Katzenelson [Thu, 29 Aug 2013 17:57:47 +0000 (10:57 -0700)]
am
1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
* commit '
1d04b640ec97e31b8d4fbef134a5b7f083eac9b7':
Add ACTION_SHOW_ALARMS to Clock API
John Spurlock [Thu, 29 Aug 2013 17:56:31 +0000 (13:56 -0400)]
More SystemUI asset updates.
White close handles, a few missed xx items.
Bug:
10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
Geoffrey Borggaard [Thu, 29 Aug 2013 17:54:37 +0000 (17:54 +0000)]
Merge "UserManagerService upgrades users on first restart." into klp-dev
Isaac Katzenelson [Thu, 29 Aug 2013 17:52:31 +0000 (17:52 +0000)]
Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
Sam Blitzstein [Wed, 28 Aug 2013 22:44:03 +0000 (15:44 -0700)]
Add ACTION_SHOW_ALARMS to Clock API
Add in an action to jump to the alarms page of a clock app.
Helpful for quick settings, for example.
Bug:
10506871
Change-Id: Ia18708c7962543911864dfaefa17d5356eed1b45
Leon Scroggins III [Thu, 29 Aug 2013 17:22:48 +0000 (10:22 -0700)]
am
4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
* commit '
4b2993123bf9a1c56d0a16b032612834dd418520':
Replace stream wrap-function w/ more specific ones
Leon Scroggins III [Thu, 29 Aug 2013 17:12:00 +0000 (17:12 +0000)]
Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
Geoffrey Borggaard [Thu, 29 Aug 2013 02:11:10 +0000 (22:11 -0400)]
UserManagerService upgrades users on first restart.
This causes all restriction pins to be reset.
Bug:
10535070
Change-Id: Ia2abf904505514d7e555b420c2b032a0094e0643
Brian Carlstrom [Thu, 29 Aug 2013 07:10:56 +0000 (00:10 -0700)]
resolved conflicts for merge of
7be3a138 to klp-dev-plus-aosp
Change-Id: If562a3203b4e737c685ec533f2d8773cae7f16ac
Jeff Hao [Thu, 22 Aug 2013 22:53:12 +0000 (15:53 -0700)]
Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit
ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
Jeff Sharkey [Thu, 29 Aug 2013 04:32:08 +0000 (21:32 -0700)]
am
9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
* commit '
9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
Stronger DocumentsProvider contract.
Jeff Sharkey [Thu, 29 Aug 2013 04:27:02 +0000 (04:27 +0000)]
Merge "Stronger DocumentsProvider contract." into klp-dev
Jeff Sharkey [Wed, 28 Aug 2013 01:26:48 +0000 (18:26 -0700)]
Stronger DocumentsProvider contract.
Using a contract class requires that a provider implement it exactly
with little help. This change introduces a DocumentsProvider abstract
class that provides a client-side implementation of the contract that
greatly reduces developer burden, and improves correctness.
This also moves to first-class DocumentRoot objects, and moves calls
with complex side effects to be ContentProvider.call() invocations,
offering more granular permission control over Uri operations that
shouldn't be available through Uri grants.
This new design also relaxes the requirement that root information be
burned into every Uri. Migrate ExternalDocumentsProvider and
DocumentsUI to adopt new API.
Bug:
10497206
Change-Id: I6f2b3f519bfd62a9d693223ea5628a971ce2e743
Baligh Uddin [Thu, 29 Aug 2013 03:09:15 +0000 (20:09 -0700)]
am
166853e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
166853e6c90abe84c556a574589419f576c5e986':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 03:09:11 +0000 (20:09 -0700)]
am
5c776270: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5c7762707733fc2001a7cb62a3daf51bc111d7db':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 03:09:08 +0000 (20:09 -0700)]
am
9c359755: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9c3597554686ab3a9fc73ab236c8c4ac31bc5083':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 03:06:07 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 03:04:13 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 03:04:00 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 01:35:58 +0000 (18:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I665172800a06d780b92a5db2ab549980c87e8524
Auto-generated-cl: translation import
Alan Viverette [Thu, 29 Aug 2013 01:17:31 +0000 (18:17 -0700)]
am
b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
* commit '
b432ca60c6c7af42989db28594137f6fe1e888b4':
Fix documentation regarding defStyle in View constructor
Alan Viverette [Thu, 29 Aug 2013 01:15:48 +0000 (01:15 +0000)]
Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 01:05:47 +0000 (18:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b1048f4afaa520fea602ec4367de5e192186bd
Auto-generated-cl: translation import
John Spurlock [Thu, 29 Aug 2013 01:04:25 +0000 (18:04 -0700)]
am
ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
* commit '
ab8fe692961bb3bf71169fd7a43aff4de837ab26':
Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
John Spurlock [Thu, 29 Aug 2013 01:00:03 +0000 (01:00 +0000)]
Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
Robert Greenwalt [Thu, 29 Aug 2013 00:54:20 +0000 (17:54 -0700)]
am
9fe5b28d: Merge "More elaborate logs to debug missing APs" into klp-dev
* commit '
9fe5b28dc2a187f5974e42ac61841b46a5d91236':
More elaborate logs to debug missing APs
Robert Greenwalt [Thu, 29 Aug 2013 00:51:35 +0000 (00:51 +0000)]
Merge "More elaborate logs to debug missing APs" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 00:36:17 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22efa95394f7b572df2b43138fee45bd7eaf4229
Auto-generated-cl: translation import
Alan Viverette [Wed, 28 Aug 2013 23:57:42 +0000 (16:57 -0700)]
Fix documentation regarding defStyle in View constructor
BUG:
8912583
Change-Id: Ib8b1f8baa4ee98aae0e66edc547ab014b2401415
Sandeep Siddhartha [Wed, 28 Aug 2013 23:57:34 +0000 (16:57 -0700)]
am
720959cc: Merge "Start using the Hotword recognition APIs" into klp-dev
* commit '
720959cc7f9fffb45a57b928c66a045bfc256a7c':
Start using the Hotword recognition APIs
Chet Haase [Wed, 28 Aug 2013 23:57:31 +0000 (16:57 -0700)]
am
52485b0b: Merge "Better transition interruption and TextChange fixes" into klp-dev
* commit '
52485b0b7ef066241371393dc6060bccd090a222':
Better transition interruption and TextChange fixes
Sandeep Siddhartha [Wed, 28 Aug 2013 23:55:57 +0000 (23:55 +0000)]
Merge "Start using the Hotword recognition APIs" into klp-dev
Chet Haase [Wed, 28 Aug 2013 23:55:10 +0000 (23:55 +0000)]
Merge "Better transition interruption and TextChange fixes" into klp-dev
Isaac Katzenelson [Wed, 28 Aug 2013 23:54:02 +0000 (16:54 -0700)]
am
18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
* commit '
18f590a9b7d2690e5f4189d8d0c025ff1a5bf199':
Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
Chet Haase [Tue, 27 Aug 2013 23:06:26 +0000 (16:06 -0700)]
Better transition interruption and TextChange fixes
Previously, the TextChange transition didn't handle interruption/
cancellation at all, which made it problematic to use in any real
situation where a transition might get interrupted mid-animation.
Also, the way that it side-effected the text of TextView objects caused
errors in the UI when the transition was interrupted, because it would
not clean up after itself properly as new transitions queried the
current state of the UI.
Also, the prior cancellation logic for all transitions was not quite
correct; we were pausing transitions but resuming the animations, making it
tricky to write transitions that would restore state correctly.
Change-Id: I5a9f3c915e9834ec59ce1e1c3c96a88d11e4aa1b
Isaac Katzenelson [Wed, 28 Aug 2013 23:49:41 +0000 (23:49 +0000)]
Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
Sandeep Siddhartha [Wed, 28 Aug 2013 23:43:41 +0000 (16:43 -0700)]
am
bd31a483: Merge "Tweak the HotwordRecognizer API" into klp-dev
* commit '
bd31a483d358b02e4a16949b576560d4e0672ea3':
Tweak the HotwordRecognizer API
Sandeep Siddhartha [Tue, 27 Aug 2013 03:58:53 +0000 (20:58 -0700)]
Start using the Hotword recognition APIs
- Gets rid of all assumptions about the hotword service
- Fixes bug where the hotword detection would keep running accidentally
even when the screen got turned off
Change-Id: Ie86c1a4f4343bdf7e61f7c21114fd3b287bd5401
Sandeep Siddhartha [Wed, 28 Aug 2013 23:38:53 +0000 (23:38 +0000)]
Merge "Tweak the HotwordRecognizer API" into klp-dev
Sandeep Siddhartha [Tue, 27 Aug 2013 20:09:41 +0000 (13:09 -0700)]
Tweak the HotwordRecognizer API
- Make it more intuitive by enforcing callers to set a listener while
starting recognition
- Fix TODO to resolve the ComponentName if none is provided
- Unbind from the Hotword service if stopRecognition is called
- Get rid of the callback in onStopHotwordRecognition
Change-Id: I8edad0ef0f3671283aeb51eaed1d3b8dab01baa0
Mindy Pereira [Wed, 28 Aug 2013 23:10:36 +0000 (16:10 -0700)]
am
dd9b079c: Merge "Fix case when user touches the very edge of a view" into klp-dev
* commit '
dd9b079cdf57f13f38d2700f05650fd04d4009d6':
Fix case when user touches the very edge of a view
Mindy Pereira [Wed, 28 Aug 2013 23:08:53 +0000 (23:08 +0000)]
Merge "Fix case when user touches the very edge of a view" into klp-dev
Mindy Pereira [Wed, 28 Aug 2013 22:00:14 +0000 (15:00 -0700)]
Fix case when user touches the very edge of a view
This now counts touches at the exact top edge of the view as valid
Change-Id: I9e81a7001632c38d567dde40954e079e7145fa36
Vinit Deshapnde [Wed, 28 Aug 2013 20:13:40 +0000 (13:13 -0700)]
More elaborate logs to debug missing APs
Bug:
10375978
Change-Id: Ic9bb8f3a7a0684143e4e77f8da0d2c833293c94a
Fabrice Di Meglio [Wed, 28 Aug 2013 19:57:03 +0000 (12:57 -0700)]
am
627dd9b5: Merge "Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
* commit '
627dd9b584a267b206bace8dc518287fe58b9563':
Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
Fabrice Di Meglio [Wed, 28 Aug 2013 19:53:56 +0000 (19:53 +0000)]
Merge "Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
John Spurlock [Wed, 28 Aug 2013 19:34:02 +0000 (12:34 -0700)]
am
f016a912: Merge "Ensure IME windows always appear north of the nav bar." into klp-dev
* commit '
f016a91247d591fd77e82383a84ae41606e30edd':
Ensure IME windows always appear north of the nav bar.
John Spurlock [Wed, 28 Aug 2013 19:32:05 +0000 (19:32 +0000)]
Merge "Ensure IME windows always appear north of the nav bar." into klp-dev
Dirk Dougherty [Wed, 28 Aug 2013 18:51:30 +0000 (11:51 -0700)]
am
f503fbd0: am
d4702f3c: am
6d3fbd00: am
8236443b: Doc change: update spam policy image.
* commit '
f503fbd0a2ec9fcd050ebfaebafcb8c2234caaab':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 18:46:48 +0000 (11:46 -0700)]
am
d4702f3c: am
6d3fbd00: am
8236443b: Doc change: update spam policy image.
* commit '
d4702f3c67473045d92eb4c3ea001d671f2f5f56':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 18:44:42 +0000 (11:44 -0700)]
am
6d3fbd00: am
8236443b: Doc change: update spam policy image.
* commit '
6d3fbd0073cdb9cd21acfb56b58a29634bd182ad':
Doc change: update spam policy image.
Sam Blitzstein [Wed, 28 Aug 2013 18:42:05 +0000 (11:42 -0700)]
Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
As per UX, we're removing the EXTRA_DELETE_AFTER_USE flag. Instead,
apps that pick up these intents should automatically delete alarms
and timers, unless the user is taken into the app to explicicitly
specify the time/length.
Change-Id: Ibd582788c04e121427467f6549759c8b7706df8c
Dirk Dougherty [Wed, 28 Aug 2013 18:42:05 +0000 (11:42 -0700)]
am
8236443b: Doc change: update spam policy image.
* commit '
8236443bdac2ba7c7630ddcc4ce9a18a03fe31a1':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 17:43:36 +0000 (10:43 -0700)]
Doc change: update spam policy image.
Change-Id: Ib19ea838f0f72725cedf2cea8aff505ccc477a45
John Spurlock [Wed, 28 Aug 2013 18:17:09 +0000 (14:17 -0400)]
Ensure IME windows always appear north of the nav bar.
Even if the bars are transparent / invisible.
Refactor the PSB bar mode override logic to take the IME hint into
account. Bars are overriden to opaque when hint is showing.
Initialize bar state to showing, fix bug that would mark state
as hidden pre-show (on shell restart).
Bug:
10505132
Bug:
9499956
Change-Id: I21e830e90c7e9812b4192ca65c3c0cd7a6b72798
Martijn Coenen [Wed, 28 Aug 2013 18:18:58 +0000 (11:18 -0700)]
Add requireDeviceUnlock attribute for NFC HCE.
Also added AID description, and renamed PackageManager
feature. The old name has to stay at least for a bit,
because we are already deploying apps in our builds that
use the constant.
Bug:
10461409
Bug:
10461753
Change-Id: I7a5bb023bb567dd8b0a17e8e54e9559d7fcf64f5
Alan Viverette [Wed, 28 Aug 2013 18:08:27 +0000 (11:08 -0700)]
am
236ae4f2: Merge "Set alpha channel correctly when recomputing gradient" into klp-dev
* commit '
236ae4f2c92bb6d17eb946b20f03155a7b8e1ac6':
Set alpha channel correctly when recomputing gradient
Alan Viverette [Wed, 28 Aug 2013 18:03:11 +0000 (18:03 +0000)]
Merge "Set alpha channel correctly when recomputing gradient" into klp-dev
Alan Viverette [Wed, 28 Aug 2013 17:49:44 +0000 (10:49 -0700)]
am
ce9e2526: Merge "Implement new accessibility APIs in lists, text view" into klp-dev
* commit '
ce9e2526d43159df931cc9c0ba7173960d8a6a06':
Implement new accessibility APIs in lists, text view
Santos Cordon [Wed, 28 Aug 2013 17:49:41 +0000 (10:49 -0700)]
am
b56ed3a4: Merge "Protecting against NPE with null country detector." into klp-dev
* commit '
b56ed3a4b2ad168b58356173e539f8112d351283':
Protecting against NPE with null country detector.
Alan Viverette [Wed, 28 Aug 2013 17:44:44 +0000 (17:44 +0000)]
Merge "Implement new accessibility APIs in lists, text view" into klp-dev
Santos Cordon [Wed, 28 Aug 2013 17:43:18 +0000 (17:43 +0000)]
Merge "Protecting against NPE with null country detector." into klp-dev
Alan Viverette [Wed, 28 Aug 2013 17:43:07 +0000 (10:43 -0700)]
Implement new accessibility APIs in lists, text view
Sets contentInvalid for TextViews with errors, sets collection
and item properties in AbsListView, GridView, and ListView.
BUG:
10391326
Change-Id: I91191c8ce1e10a1112f74215e30b26349396344b
Alan Viverette [Wed, 28 Aug 2013 17:27:24 +0000 (10:27 -0700)]
am
116c12ef: Merge "Add public API for obtaining drag-to-open listener" into klp-dev
* commit '
116c12ef4c5fc2d5e5e90a417c4386c1f9a3ddf6':
Add public API for obtaining drag-to-open listener
Alan Viverette [Wed, 28 Aug 2013 17:25:06 +0000 (17:25 +0000)]
Merge "Add public API for obtaining drag-to-open listener" into klp-dev
Alan Viverette [Wed, 28 Aug 2013 17:24:12 +0000 (10:24 -0700)]
Set alpha channel correctly when recomputing gradient
The alpha channel is applied by modulateAlpha(). Setting it to
mAlpha in ensureValidRect() locked the maximum alpha channel to
whatever value was set before layout. Setting it to BLACK
ensures it can be modulated later.
BUG:
10514848
Change-Id: If7a824410a66f1e9b648e20ee627bdf99a42ae78
Marco Nelissen [Wed, 28 Aug 2013 17:21:55 +0000 (10:21 -0700)]
am
ee9d4438: Merge "Use explicit intent for MediaScannerConnection" into klp-dev
* commit '
ee9d44384239fff3d61cd4dd27f9daefb8a7103a':
Use explicit intent for MediaScannerConnection
Marco Nelissen [Wed, 28 Aug 2013 17:19:47 +0000 (17:19 +0000)]
Merge "Use explicit intent for MediaScannerConnection" into klp-dev
Jason Monk [Wed, 28 Aug 2013 14:43:39 +0000 (07:43 -0700)]
am
1f809c77: Merge "Don\'t clear Global Proxy on boot." into klp-dev
* commit '
1f809c7761a52102621b22fe8ec8c9f91ec1fe54':
Don't clear Global Proxy on boot.
Jason Monk [Wed, 28 Aug 2013 14:41:15 +0000 (14:41 +0000)]
Merge "Don't clear Global Proxy on boot." into klp-dev
John Spurlock [Wed, 28 Aug 2013 13:28:23 +0000 (06:28 -0700)]
am
d20aeab0: Merge "SystemUI asset update post ux asset merge." into klp-dev
* commit '
d20aeab028bae53b46a707119e57a50c073337c2':
SystemUI asset update post ux asset merge.
John Spurlock [Wed, 28 Aug 2013 13:26:01 +0000 (13:26 +0000)]
Merge "SystemUI asset update post ux asset merge." into klp-dev
Daniel Sandler [Wed, 28 Aug 2013 13:03:17 +0000 (06:03 -0700)]
am
f31da76a: Merge "Remove period from "No service."" into klp-dev
* commit '
f31da76a3a36c75eafa7078a90d982c0e6916b41':
Remove period from "No service."
John Spurlock [Wed, 28 Aug 2013 12:56:20 +0000 (08:56 -0400)]
SystemUI asset update post ux asset merge.
Bug:
10502089
Change-Id: I88b0b4a17018766bccb99426f8f270214c883427
Daniel Sandler [Wed, 28 Aug 2013 13:01:20 +0000 (13:01 +0000)]
Merge "Remove period from "No service."" into klp-dev
Daniel Sandler [Thu, 13 Jun 2013 19:58:26 +0000 (15:58 -0400)]
Remove period from "No service."
Bug:
10460869
Change-Id: I57b030518c9cfec367da21e39af7a001a565daa4
Zhijun He [Wed, 28 Aug 2013 02:24:59 +0000 (19:24 -0700)]
am
5b6ce5a2: Merge "ImageReader: Fix null listener case" into klp-dev
* commit '
5b6ce5a2921caa63481630f877356e5678ee9ffa':
ImageReader: Fix null listener case
Zhijun He [Wed, 28 Aug 2013 02:22:36 +0000 (02:22 +0000)]
Merge "ImageReader: Fix null listener case" into klp-dev
John Spurlock [Wed, 28 Aug 2013 01:31:34 +0000 (18:31 -0700)]
am
ae73139f: Merge "Remove unreferenced assets from SystemUI." into klp-dev
* commit '
ae73139f37a34cb4cc51255cc15cd19fbc11416a':
Remove unreferenced assets from SystemUI.