drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,453 Commits 1 Branch 0 Tags
Commit Graph

158453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Tsuk
fd15f47554 Log shader source when it fails to compile 
So that there will be something to diagnose when such failures occur during
stability tests.

Bug: 18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
 2014-11-05 13:26:19 -08:00
John Spurlock
3a9321d407 Docs: Fix typo in Preference android:order attribute. 
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
 2014-11-05 21:20:36 +00:00
Rich Slogar
aaafc8ec67 am faac8b79: am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit 'faac8b798359a6065a509dc0b127e887fed5d8a4':
  docs:remove  sdk/ndk note
 2014-11-05 20:56:49 +00:00
Rich Slogar
faac8b7983 am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit 'c3d174a0304d3be57e485c48783d7c101553c78a':
  docs:remove  sdk/ndk note
 2014-11-05 20:50:03 +00:00
Sanket Padawe
4960a5bb0c Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 
automerge: d12b695

* commit 'd12b69518daabff3c13482f4b5140020b747b71f':
  Changes related to setting default color for sim in multisim.
 2014-11-05 20:33:37 +00:00
Sanket Padawe
d12b69518d Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 2014-11-05 20:30:30 +00:00
Andrew Solovay
4f0850a138 am fbc3bdec: am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge: 8d7d7b4 
* commit 'fbc3bdec7a2a80e8c3f1cdfebaecc6dba82c9cc6':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:26:24 +00:00
Ricardo Cervera
1ea2575350 am 5a57ec02: am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs automerge: b2f0f35 
* commit '5a57ec024ffb14bbbf8dfdd5215b4a08c33ea97d':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:26:20 +00:00
Andrew Solovay
fbc3bdec7a am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
automerge: 8d7d7b4

* commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:22:24 +00:00
Ricardo Cervera
5a57ec024f am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 
automerge: b2f0f35

* commit 'b2f0f3514c20b478655e4c3f192a98cfea2335ce':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:21:03 +00:00
Eric Laurent
b27a8a5bcc AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
 2014-11-05 12:20:49 -08:00
Rich Slogar
c3d174a030 am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit '848d912505079cc3cbd362a4333f0eabfac3c1c5':
  docs:remove  sdk/ndk note
 2014-11-05 20:17:55 +00:00
Rich Slogar
848d912505 am 1afa82dc: docs:remove sdk/ndk note 
* commit '1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
  docs:remove  sdk/ndk note
 2014-11-05 20:13:35 +00:00
John Spurlock
6ccb72e994 Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 
automerge: 2f9e7f6

* commit '2f9e7f6d8b6716f0fcc7db9ef797667ebda8a813':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 19:32:54 +00:00
Adam Lesinski
fb96e54ba8 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 
automerge: 69ecfa9

* commit '69ecfa903492b502b7b1636345e050b57313c251':
  Add error checking to aapt for split generation
 2014-11-05 19:31:22 +00:00
Craig Mautner
a72b2228c2 Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 
automerge: 3f36ba6

* commit '3f36ba647d6bd49363ea9f025a8b1aeac0abeddd':
  When keyguard exits use same anim for all windows
 2014-11-05 19:30:19 +00:00
John Spurlock
2f9e7f6d8b Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 2014-11-05 19:17:39 +00:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00
John Spurlock
cc30c8d729 Zen: Add the ability to enter "None" mode during downtime. 
Updates to the shared config structure and the service backend.

Bug: 16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d
 2014-11-05 14:12:30 -05:00
Paul Jensen
6ad91cbce2 am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
* commit '021a95f761e1bc26cc215a9daedb04af818002f5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 19:11:32 +00:00
Craig Mautner
3f36ba647d Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 2014-11-05 19:07:59 +00:00
Dan Sandler
125fb86ee0 am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev 
* commit 'ac8dbdafeab9db9f44a40ea31d5cdbc1404acb68':
  Materialize default app icon.
 2014-11-05 19:06:25 +00:00
Paul Jensen
021a95f761 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 2014-11-05 19:05:09 +00:00
Ricardo Cervera
0f288c6a24 am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit 'caecc4ae3d11604fd20230dab79a9b79634d2c48':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 19:01:02 +00:00
Bryce Lee
1ae5dc12d0 am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit 'ca7f9a4d4eaa4a14c45199a586ec25efee7407fa':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 19:00:56 +00:00
Daniel Sandler
9647bdd97e am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '70bbbd32beefbb8e5c2e2dfa7a417274f80e2da2':
  More flexible intent extra parsing.
 2014-11-05 19:00:51 +00:00
Dan Sandler
ac8dbdafea Merge "Materialize default app icon." into lmp-mr1-dev 2014-11-05 18:58:14 +00:00
Ricardo Cervera
caecc4ae3d am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit 'df37d45f1311dcbfbcc58b3ff81f3df56c46fcdd':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 18:54:12 +00:00
Bryce Lee
ca7f9a4d4e am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '5a818e55a7faee421567eb037ac4e42f20bca0c4':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 18:54:06 +00:00
Daniel Sandler
70bbbd32be Merge "More flexible intent extra parsing." into lmp-mr1-dev 2014-11-05 18:53:44 +00:00
Andrew Solovay
8d7d7b448f am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
* commit '56576838a8e8c4f44f8df13cc40295a918540b86':
  docs: Removed broken link to non-existent method.
 2014-11-05 18:52:27 +00:00
Ricardo Cervera
b2f0f3514c am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 
* commit 'b4125d1e0bbf1ce90d0bfb03e5e068180bbb6b20':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 18:52:23 +00:00
RoboErik
acbdb4fe5d am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit '9af44ddf0367c542d6c1db6060456bd72f3c83ca':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 18:49:54 +00:00
RoboErik
e2b8dab0d0 am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit '5604a85ac61eb01794cf1dd9ea83321bcf93b57a':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:49:49 +00:00
Jeff Davidson
d9685fac35 am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'ea651a4fbf274d229ead0185286c94b6e823d605':
  Update network selections on capability change.
 2014-11-05 18:49:44 +00:00
Filip Gruszczynski
093e989087 am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '34afdf0276044f7d40c58df65dd13b9cb774d7c6':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:49:39 +00:00
Andrew Solovay
56576838a8 am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
  docs: Removed broken link to non-existent method.
 2014-11-05 18:47:17 +00:00
Craig Mautner
276a6eb879 When keyguard exits use same anim for all windows 
The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.

Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.

This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.

(Also refactorings to eliminate redundant code and unnecessary
variables.)

Fixes bug 15991916.

Change-Id: I844d102439b6eda8c912108431916e04b12f7298
 2014-11-05 10:47:14 -08:00
Ricardo Cervera
b4125d1e0b am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 
* commit '58f1200c333deea72ed6e095587f0bcb1fb65ce3':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 18:47:13 +00:00
Rich Slogar
1afa82dce0 docs:remove sdk/ndk note 
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
 2014-11-05 10:46:50 -08:00
RoboErik
9af44ddf03 Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 2014-11-05 18:29:32 +00:00
Jeff Davidson
f92fc1ca65 Fix incorrect doc for WifiInfo#getSSID(). 
This method will never return null. It may return "<unknown ssid>" if
no network is currently connected.

Change-Id: Iae09a6b2376e47c2d010f8d05750a16361510cca
 2014-11-05 10:26:00 -08:00
RoboErik
5604a85ac6 Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:26:00 +00:00
Andrew Solovay
d9ceae8f97 Merge "docs: Removed broken link to non-existent method." into lmp-docs 2014-11-05 18:14:05 +00:00
Jeff Davidson
ea651a4fbf Merge "Update network selections on capability change." into lmp-mr1-dev 2014-11-05 17:41:36 +00:00
Filip Gruszczynski
34afdf0276 Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 2014-11-05 17:39:34 +00:00
Tyler Gunn
0bfb97cddf Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev 
automerge: 4255ec5

* commit '4255ec5c57ace18b0a78ebcbf0d573213123e586':
  Support disconnecting conference participants from conference.
 2014-11-05 17:38:45 +00:00
Selim Cinek
e52abb3e91 Adapted HUN behavior when swiping vertically 
It's not dismissed anymore but pushed into the shade
when swiping up.
Also, when swiping down, we now dimiss the HUN.

Bug: 15594813
Change-Id: I0b6a761bebbe281e31bf3b1e20704e2e5da07861
 2014-11-05 18:12:27 +01:00
Selim Cinek
9bd9d0c96a Fixed a bug where the HUNs were not clickable 
Also improved the edgeswipehelper to use 45 degree
touch disambiguation.

Bug: 18102199
Change-Id: I153e094d5d86439ae048137fc5eac47966b12ca5
 2014-11-05 18:12:27 +01:00
Selim Cinek
1a521f3ea8 Fixed a bug that the notifications were not animating when reset 
Also made sure that the touch event is never filtered when its a
heads up view.

Bug: 18188693
Change-Id: Ic5de3e36c785d2cf890936322820b739a0a1b107
 2014-11-05 18:12:15 +01:00