Commit Graph

41860 Commits

Author SHA1 Message Date
Dianne Hackborn
2f58bab7b0 am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev
* commit '221b545cdaba2522fbb299428ac048641410c284':
  Fix issue #18510117: Returning from an activity started with...
2014-12-02 19:33:28 +00:00
Kweku Adams
fa99c345c4 am d537987b: Changing AUDIO_TURNED_ON constant.
* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
  Changing AUDIO_TURNED_ON constant.
2014-12-02 19:33:23 +00:00
Dianne Hackborn
221b545cda Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 2014-12-02 19:22:07 +00:00
Kweku Adams
d537987b17 Changing AUDIO_TURNED_ON constant.
Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
2014-12-02 19:18:13 +00:00
Dianne Hackborn
a01a0faebf Fix issue #18510117: Returning from an activity started with...
...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
2014-12-02 10:33:14 -08:00
Chris Craik
363f0d9fd9 am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
  Sync ViewOverlay size init with RenderNode
2014-12-02 17:04:34 +00:00
Chris Craik
81defc6a84 Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 2014-12-02 16:59:21 +00:00
Paul Crowley
f57d9dcbc7 am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev
* commit 'fbeeac8266c190afba084cfc1164385ff5020fce':
  Add a tag to separate paragraphs in Javadoc
2014-12-02 14:48:57 +00:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
2014-12-02 11:21:13 +00:00
Andre Eisenbach
fcb948526f am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
* commit 'a1a6c300afffebfb46e84dc1941f6bddca145a8f':
  Add server-side callback for change in MTU (4/4)
2014-12-02 08:07:48 +00:00
Andre Eisenbach
a1a6c300af Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 2014-12-02 08:02:02 +00:00
Erik Kline
d125266b3c am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
* commit 'f27b52aaa75884a41ea687116ff3758125b94e39':
  Revert some verbose logging from ag/489226
2014-12-02 07:29:05 +00:00
Erik Kline
f27b52aaa7 Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 2014-12-02 07:22:33 +00:00
Alan Viverette
cc636f0824 am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev
* commit '4515f785878cb150bef467d40abc9d5b172570fe':
  Only send haptic events from time picker when time changes
2014-12-02 02:03:49 +00:00
Alan Viverette
4515f78587 Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 2014-12-02 01:58:31 +00:00
Chris Craik
2180ba7abd Sync ViewOverlay size init with RenderNode
bug:18381202

Setting mRight/mBottom must be accompanied by updating the RenderNode.

Change-Id: I4dae06a5ca43247b0b3642d85808e2724e486692
2014-12-01 17:55:37 -08:00
Alan Viverette
002f918cea Only send haptic events from time picker when time changes
BUG: 18572841
Change-Id: Iaa26e2f0804e301f8754e19a1d03dbd2142bf044
2014-12-01 16:13:32 -08:00
Yuncheol Heo
1d22f99da9 am f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit 'f17024873b10dabed069e502030dd85d6257c0c4':
  CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:39:17 +00:00
Yuncheol Heo
f17024873b CEC: make it sure to send vendor commands when changing a setting.
- Remove 'oneway' from IHdmiVendorCommandListener.
- Add flush() method to HdmiCecController.
- Use IoThread for HdmiCecController.

Bug: 18495592
Change-Id: I497f7b49e94dd4402058ecc89cb5b7a3d58bf1e1
2014-12-02 07:52:16 +09:00
Alan Viverette
23dc05634d am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
* commit 'e6bd61d5bbea012b6b80c8bff915042f615630bc':
  Fix visible rect computation for views with padding
2014-12-01 22:12:44 +00:00
Alan Viverette
e6bd61d5bb Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev 2014-12-01 22:06:13 +00:00
Wale Ogunwale
e05fbd6901 am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
  Added unique id to display devices and their settings.
2014-12-01 20:30:33 +00:00
Wale Ogunwale
997e632f59 Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 2014-12-01 20:26:06 +00:00
Alan Viverette
53644fb5ac am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '015b9e56d4ad528dd406672ef6264c85e41a20fd':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
2014-12-01 19:17:30 +00:00
Alan Viverette
015b9e56d4 Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 2014-12-01 19:12:49 +00:00
Jeff Sharkey
05d455ca2b am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit 'b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
  Sanitize display names, keep extensions intact.
2014-12-01 19:00:56 +00:00
Jeff Sharkey
0cce5355b4 Sanitize display names, keep extensions intact.
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames.  This also fixes
a handful of directory traversal bugs.

Also relax logic around generating display names to allow any
extension which maps to the requested MIME type.  Tests to verify.

Bug: 18512473, 18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
2014-12-01 09:38:49 -08:00
John Spurlock
23a99a3ab0 am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '21d68f4808db02aa3252ba5dec8b0220d053cab3':
  Volume: Improve inline volume controls used in settings.
2014-12-01 17:11:21 +00:00
John Spurlock
21d68f4808 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 2014-12-01 17:06:14 +00:00
Chet Haase
8394e9fff3 am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit '2187144408dbdb5322a2212fa2e68a5891ea60ca':
  Zero duration animations snap to end value when started
2014-12-01 15:58:46 +00:00
Chet Haase
2187144408 Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 2014-12-01 15:52:59 +00:00
John Spurlock
64e034e351 am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
  Zen: Improve zen mode panel condition selection.
2014-12-01 15:04:02 +00:00
John Spurlock
e3f8b31466 Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 2014-12-01 14:59:05 +00:00
Chet Haase
5a25e5bae2 Zero duration animations snap to end value when started
A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.

Issue #18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)

Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
2014-12-01 06:57:15 -08:00
John Spurlock
3e07701636 Zen: Improve zen mode panel condition selection.
- Decouple condition requests from expansion, now
   pre-request when zen panel unhidden.
 - Animate zen mode panel expansion.
 - Improve default selection logic, ensure something
   is selected as soon as we are in the expanded state.
 - Tweak visual spacing.
 - Map null condition to Indef properly when we start
   out in zen.
 - Avoid unnecessary condition teardown when the conditions
   are updated but unchanged from current.
 - Cap number of optional conditions to display, default=3.

Bug: 18335618

Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
2014-11-30 10:41:33 -05:00
John Spurlock
bcc1087af4 Volume: Improve inline volume controls used in settings.
- Make the system internal ringer mode change signal available to
   other system components via a standard intent, instead of a
   volume-controller-only binder call.
 - Update sysui to use new intent for icon policy.
 - Add proper muting state to the volumizer, to look more like
   the associated volume panel slider.
 - Add basic ringer mode state tracking for the notification-ring
   slider setting.

Bug: 17899613
Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
2014-11-28 15:29:21 -05:00
Narayan Kamath
ff45e7df8a am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev
* commit '1d184acefa7105592134edebf7de4d77843d5791':
  Be increasingly aggressive about fstrim if it isn't being run
2014-11-27 10:09:46 +00:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
2014-11-27 09:57:35 +00:00
Eino-Ville Talvala
ec26692d1f am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit '9b35b801fb90e31c1dff5535715e505f3a1e26fb':
  CameraManager: Separate service listener into a singleton
2014-11-27 00:27:36 +00:00
Eino-Ville Talvala
9b35b801fb Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 2014-11-27 00:23:42 +00:00
Alan Viverette
d26276d9e3 Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
2014-11-26 16:08:58 -08:00
Alan Viverette
ab2cf6dafe Fix visible rect computation for views with padding
Previously, the computation was double-counting the left and top padding
because it was treating the third and fourth Rect.intersect() arguments
as width and height rather than right and bottom.

BUG: 18418091
Change-Id: I2ab669ee5060372ae11cfe804dcc05c7426be1ec
2014-11-26 14:34:36 -08:00
Eino-Ville Talvala
4c9c7a5883 CameraManager: Separate service listener into a singleton
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.

This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.

Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.

Bug: 18077200

Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
2014-11-26 13:58:15 -08:00
Wale Ogunwale
361ca21acc Added unique id to display devices and their settings.
The display setting saved to disk were using a localized name for
the key. This is an issue if the user changes languages after the
display settings have been saved. We now use the non-localized
name for the display to access the settings if it is available,
else we fall back on the localized name.

Bug: 18190800
Change-Id: I837c06a8935df10727229a1aa2bb6eeb3953707f
2014-11-26 13:40:52 -08:00
Andre Eisenbach
16bf846990 Add server-side callback for change in MTU (4/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.

Bug: 18388114
Change-Id: I515bfc2cc9846490d57de71860f41ea9a61fa243
2014-11-26 12:58:44 -08:00
Narayan Kamath
7377998dac resolved conflicts for merge of a42f7c1d to lmp-sprout-dev
Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
2014-11-26 10:39:08 +00:00
Alan Viverette
c8361ba78e am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev
* commit '0a310c99ee3217567f66578de2d2051e611d39aa':
  Revert "Animates AbsSeekBar progress movement from key presses."
2014-11-26 00:56:47 +00:00
Alan Viverette
30c0d5b5ea am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev
* commit '8a45126a2986fd408dec7c531ee1cadb690aaffd':
  Load SPEAK_PASSWORD from currently active user rather than self
2014-11-26 00:56:43 +00:00
Alan Viverette
0a310c99ee Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 2014-11-26 00:52:36 +00:00