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

158409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
aa62703752 am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'c838b677749e0c20fc201b0418864be3835711b8':
  Cancel animation when target changes.
 2014-11-05 23:08:24 +00:00
George Mount
c838b67774 Merge "Cancel animation when target changes." into lmp-mr1-dev 2014-11-05 23:04:18 +00:00
Rob Tsuk
db6a1358d4 am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit '6c96cbf581bf97b034e4c65eabe3c0fe8d930bfa':
  Log shader source when it fails to compile
 2014-11-05 22:26:11 +00:00
Rob Tsuk
6c96cbf581 Merge "Log shader source when it fails to compile" into lmp-mr1-dev 2014-11-05 22:22:52 +00:00
Eric Laurent
29218f2471 am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 
* commit 'e43bf0821b41b135892001ad89518eb08d67bcd4':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-05 22:06:23 +00:00
Eric Laurent
e43bf0821b Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 2014-11-05 22:02:54 +00:00
John Spurlock
f97f830467 am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'cdb72e2392e76da341496d073c601d04b030c990':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:55:40 +00:00
John Spurlock
cdb72e2392 am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'c2a0d9e54e778338d73c99598dc741eebd58a326':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:47:32 +00:00
Winson Chung
5284dd8d69 am 91283969: Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 
* commit '9128396982233d6af49613231100f1bc4b6c477b':
  Fixing crash in recents window transition.  (Bug 18246975, 18159006)
 2014-11-05 21:42:38 +00:00
John Spurlock
c2a0d9e54e am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '66c46c4a9289a8e21c8f36fe06679be5f6534841':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:40:46 +00:00
Winson Chung
9128396982 Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 2014-11-05 21:39:16 +00:00
Jeff Davidson
dd40ccf362 am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'b42bdef51c5a4de44333ad268f25df1aac5ab880':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:37:34 +00:00
John Spurlock
66c46c4a92 am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:36:13 +00:00
Jeff Davidson
b42bdef51c Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 2014-11-05 21:33:16 +00:00
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