Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,030 Commits 3 Branches 0 Tags
cacd99bd2cbfad3bfd78bef3d4c612ddda2e2ad7
Commit Graph

48234 Commits

Author SHA1 Message Date
Dianne Hackborn
6acccd524d am 1c2f6ca1: am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '1c2f6ca13672c5d3c33e7d18afa7b92b9a8f6d64':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:45:34 +00:00
Kweku Adams
9b489990fe am 51de927f: am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit '51de927f5ae9b754c4b3927eb8c109ee4dfc602d':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:45:29 +00:00
Dianne Hackborn
1c2f6ca136 am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:40:10 +00:00
Kweku Adams
51de927f5a am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit 'fa99c345c440a37ae0cc74cba6ffd6e88ab9ddb2':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:40:04 +00:00
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
Christoph Studer
cf9727b928 am 4b1cbaaf: am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 
* commit '4b1cbaaf4ec9f3f58a389496faacf77ee46fa2ed':
  NoMan/SysUI: Clear LEDs only when entering the shade
 2014-12-02 19:14:29 +00:00
Christoph Studer
4b1cbaaf4e am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 
* commit 'cd9eb9bee788252cd6d6bcdb7fcdc5a5d0dcfe5c':
  NoMan/SysUI: Clear LEDs only when entering the shade
 2014-12-02 19:08:13 +00:00
Christoph Studer
cd9eb9bee7 am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 
* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
  NoMan/SysUI: Clear LEDs only when entering the shade
 2014-12-02 18:59:26 +00:00
Christoph Studer
27ef018846 Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 2014-12-02 18:49:51 +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
f9550fa061 am faf4a61a: am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit 'faf4a61a88136d26935728e06b7916f1f31afdbd':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:19:21 +00:00
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
Christoph Studer
1f32c65697 NoMan/SysUI: Clear LEDs only when entering the shade 
Don't clear notification LEDs when seeing notifications on the
lockscreen.

Also fix a bug where the LED didn't continue flashing after
the screen turned off.

For devices with doze capability, ensure that the LED continuing
to flash after screen off doesn't cause an immediate pulses, but
delay the first pulse by 10s.

Bug: 15449039
Change-Id: Id34d51a2c91ceaf069e49add1ab690bb855f9638
 2014-12-02 16:52:13 +01:00
Paul Crowley
ef370c0ca0 am 05f23d97: am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit '05f23d974bdfc5fb221f0bfa5bef4e9c915e52d9':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 15:04:15 +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
2b5f59d524 am b45c38ac: am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'b45c38acc7c4ea0eaa79209e0d6de7c4f0f34c52':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:24:19 +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
80a4543ca2 am d8b011a3: am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'd8b011a3548910a26d5b7a451bafb07b5384e246':
  Revert some verbose logging from ag/489226
 2014-12-02 07:42:45 +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
Yigit Boyar
57f3548173 am f4835bd7: am d11e2b7c: am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit 'f4835bd7b137aafac06ae43a55a6cbc51104e1c2':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:26:04 +00:00
Yigit Boyar
f4835bd7b1 am d11e2b7c: am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit 'd11e2b7cdd283ebfd2c41e7616a54bcc084d0a30':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:19:22 +00:00
Alan Viverette
8b08e2c6af am 6591b025: am cc636f08: am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit '6591b0259cbd6f694303e7068d8b1578f4c2dc2a':
  Only send haptic events from time picker when time changes
 2014-12-02 02:17:33 +00:00
Yigit Boyar
d11e2b7cdd am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit '498c84e7366cc0b4355f034bd03534a14beaf166':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:12:06 +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
Yigit Boyar
498c84e736 Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 2014-12-02 02:07:26 +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
Adam Powell
aeb1cd74e8 am 35bed6fd: am 920c27b2: am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 
* commit '35bed6fd4e3b84e2233b1b3c31d7586193946223':
  Make work profile apps easier to pick in ResolverActivity
 2014-12-02 01:25:48 +00:00
Adam Powell
35bed6fd4e am 920c27b2: am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 
* commit '920c27b24aada088aae0b9644fcf5519575e0433':
  Make work profile apps easier to pick in ResolverActivity
 2014-12-02 00:56:48 +00:00
Adam Powell
920c27b24a am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 
* commit '4cd577f0ac1df92ffbf196d1fb31a7124bbe2f51':
  Make work profile apps easier to pick in ResolverActivity
 2014-12-02 00:50:39 +00:00
Adam Powell
4cd577f0ac Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 2014-12-02 00:46:01 +00:00
Adam Powell
88831a2a6f Make work profile apps easier to pick in ResolverActivity 
Pull the "Work" profile item up out of the main list and into the
header of the resolver drawer, making it easier to discover and access
without disrupting the sort order of the list.

Bug 17935301

Change-Id: Id2d081b61828352c998e517127132f883a20b7ef
 2014-12-01 16:43:31 -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
b557195c5d am 96af2bd7: am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting. 
* commit '96af2bd77a9bf80799d681bfd05351df04ee69f4':
  CEC: make it sure to send vendor commands when changing a setting.
 2014-12-01 23:51:38 +00: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