Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,893 Commits 3 Branches 0 Tags
e67cf73146cecce5be22264ca7c596b454ded08d
Commit Graph

43136 Commits

Author SHA1 Message Date
Chris Craik
faf4a61a88 am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit '363f0d9fd92129c07d769e43fbc9b46dacc01a3b':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:13:08 +00: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
05f23d974b am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit 'f57d9dcbc7ecbae8bc8f821532a508c22bc3327f':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 14:57:31 +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
b45c38acc7 am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'fcb948526ff400b0773a44aecd56c366c13efa98':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:14:11 +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
d8b011a354 am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'd125266b3c0cabcb42e6331a312c66071fedd752':
  Revert some verbose logging from ag/489226
 2014-12-02 07:35:59 +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
6591b0259c am cc636f08: am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit 'cc636f08249011f0e99b7d7ddfca31e2c7a9bec3':
  Only send haptic events from time picker when time changes
 2014-12-02 02:10:12 +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
96af2bd77a am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting. 
* commit '1d22f99da94f131c8047870a8c090b39630f5069':
  CEC: make it sure to send vendor commands when changing a setting.
 2014-12-01 23:45:07 +00: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
b08a028da6 am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev 
* commit '23dc05634d7bc4a1d436b27dc4cd8bc518834e49':
  Fix visible rect computation for views with padding
 2014-12-01 22:18:58 +00: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
ea64d0beea am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.
 2014-12-01 20:37:01 +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
02cd927dff am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '53644fb5acd394b875723b6483215ba837f8e6c0':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:00:49 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:00:32 +00:00
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:47:58 +00:00
Chet Haase
fd942b50f1 am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit '8394e9fff32c8935e021f0e4e84c5c1de913b96f':
  Zero duration animations snap to end value when started
 2014-12-01 19:47:15 +00:00
John Spurlock
f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:46:50 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +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
Craig Mautner
b97f719036 am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:26:47 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00: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
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
 2014-11-27 18:03:15 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache. 
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
 2014-11-27 17:23:41 +00:00