Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,480 Commits 3 Branches 0 Tags
7494e13705a0f1585c661d13bc655682cfefffa9
Commit Graph

45464 Commits

Author SHA1 Message Date
Filip Gruszczynski
0821a56668 am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit 'f675cad8f5f5781a29ccd733570d90bae3fe8d84':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 02:59:35 +00:00
Filip Gruszczynski
f675cad8f5 am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 02:53:41 +00:00
Filip Gruszczynski
6e854ce572 Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 2014-12-03 02:23:33 +00:00
Alan Viverette
bb241c3cde am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit '4eb2e04f4d3eafdf56840a0988dd730dc433478d':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 02:18:12 +00:00
George Mount
24fac506f0 am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
  Keep snapshot order matching the shared elements.
 2014-12-03 02:17:58 +00:00
Filip Gruszczynski
a2838dfc2c Add overscan insets to surface frame dimensions in WallpaperService. 
Bug: 18595832
Change-Id: Ia5a03cc5e059153d76907627ee0811b0851e35ed
 2014-12-02 17:23:41 -08:00
Alan Viverette
4eb2e04f4d Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 2014-12-03 00:43:47 +00:00
Alan Viverette
9752428dc1 Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting 
Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
 2014-12-02 16:24:24 -08:00
George Mount
561261d444 Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 2014-12-03 00:13:28 +00:00
Alan Viverette
a6779bc517 am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 
* commit '9a888816de21c4e146acbd608fdea110a299f42d':
  Deprecate one-arg getDrawableForDensity, update currents.txt
 2014-12-02 23:37:47 +00:00
Alan Viverette
a6f8b2ce55 Deprecate one-arg getDrawableForDensity, update currents.txt 
BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff
 2014-12-02 15:26:33 -08:00
Alan Viverette
63c7a655be am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 
* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
 2014-12-02 23:11:36 +00:00
Alan Viverette
c10e3960d9 Deprecate Resources.getDrawable(int) in favor of the two-arg version 
This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8
 2014-12-02 14:58:08 -08:00
George Mount
92692c0284 Keep snapshot order matching the shared elements. 
Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f
 2014-12-02 14:31:31 -08: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
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
Ricardo Cervera-Navarro
d5412e3580 am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
  Sensor documentation fixes.
 2014-12-02 18:53:20 +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
Ricardo Cervera-Navarro
0ac703fc8f am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit '1108b845f940debde0c1959a9293cafdc264afcc':
  Sensor documentation fixes.
 2014-12-02 18:46:30 +00:00
Ricardo Cervera-Navarro
1108b845f9 Merge "Sensor documentation fixes." into lmp-docs 2014-12-02 18:33:50 +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
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
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
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
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
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
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