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

158381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
RoboErik
9af44ddf03 Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 2014-11-05 18:29:32 +00: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
Ricardo Cervera
df37d45f13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev 
automerge: 25a4e21

* commit '25a4e21e13217708e9ff99beb21f88151ea2cbd4':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 17:08:37 +00:00
Tyler Gunn
4255ec5c57 Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev 2014-11-05 17:03:13 +00:00
Dan Sandler
d29149d2ee Materialize default app icon. 
Bug: 17999428
Change-Id: Ib7430993fc44051c70a802442dce15ca4cd592d4
 2014-11-05 12:02:22 -05:00
Ricardo Cervera
58f1200c33 Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 2014-11-05 17:00:10 +00:00
Ricardo Cervera
25a4e21e13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev 2014-11-05 16:58:23 +00:00
Bryce Lee
5a818e55a7 Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 2014-11-05 16:41:40 +00:00
Jorim Jaggi
80a28fe8d6 Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev 
automerge: 09ba32c

* commit '09ba32c0ba9306bafa25e27a2fa7d6e53e9be715':
  Fix janky in transition doze -> lockscreen
 2014-11-05 16:37:13 +00:00
Andres Morales
3bc103b8db Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev 
automerge: 36531b3

* commit '36531b33b8e5bb249010f2414ed41d244c571464':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
 2014-11-05 16:36:06 +00:00
George Mount
dd185b657d Merge "Fix javadoc." into lmp-mr1-dev 
automerge: 8b26674

* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
  Fix javadoc.
 2014-11-05 16:34:41 +00:00
Jorim Jaggi
09ba32c0ba Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev 2014-11-05 16:17:33 +00:00
Andres Morales
36531b33b8 Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev 2014-11-05 16:01:24 +00:00
George Mount
8b26674aa1 Merge "Fix javadoc." into lmp-mr1-dev 2014-11-05 15:22:43 +00:00
John Spurlock
513f260200 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 
automerge: 0bdefb9

* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:20:12 +00:00
John Spurlock
055acca7c8 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev 
automerge: 2face5e

* commit '2face5e2e86cb7850c2ce67306f5aad04af6f597':
  QS: Toggle tile icon animations.
 2014-11-05 15:19:02 +00:00