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

172071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
c053e41d02 am 8d37f7c1: am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '8d37f7c1b28c4e82b3bc961d183c313db16d8333':
  More flexible intent extra parsing.
 2014-11-05 20:15:27 +00:00
Daniel Sandler
8d37f7c1b2 am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '9647bdd97ec7fda804244bde195ca10219726e89':
  More flexible intent extra parsing.
 2014-11-05 19:06:25 +00:00
RoboErik
341dd2bda5 am 5468f292: am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit '5468f292f31383ba1ea9b488e1d0dfc743764f47':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 19:01:45 +00:00
RoboErik
305563bd63 am 6651cd38: am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit '6651cd38307d516f5c8e322828b7aaa076231071':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 19:01:40 +00:00
Jeff Davidson
b2e27cd6b8 am a820564d: am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'a820564d9c43f2a3241339aec9ba08803e37b3ed':
  Update network selections on capability change.
 2014-11-05 19:01:36 +00:00
Filip Gruszczynski
0f337b776b am cac8e4a5: am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit 'cac8e4a5aaf35e1dae23da3b4557d8f3d37c07b8':
  Automatic brightness using ALS while dozing.
 2014-11-05 19:01:26 +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
RoboErik
5468f292f3 am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit 'acbdb4fe5d2e4bd7729f3685b2d78421d5d13cc8':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 18:55:53 +00:00
RoboErik
6651cd3830 am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit 'e2b8dab0d0f541e4a014536f8088ac51afc06c49':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:55:46 +00:00
Jeff Davidson
a820564d9c am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'd9685fac35c1c3ba797eb9e534ec15888aaa3a8b':
  Update network selections on capability change.
 2014-11-05 18:55:40 +00:00
Filip Gruszczynski
cac8e4a5aa am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '093e98908743eb37104a280541a060dcd46351d0':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:55:34 +00:00
Daniel Sandler
70bbbd32be Merge "More flexible intent extra parsing." into lmp-mr1-dev 2014-11-05 18:53:44 +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
Tyler Gunn
8f4be068d3 am d331e4ec: Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5 automerge: 0bfb97c 
* commit 'd331e4ec260df97e646c8481b6aba3c2e54d0555':
  Support disconnecting conference participants from conference.
 2014-11-05 18:47:50 +00:00
Jorim Jaggi
183455b02a am 80ae2850: Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c automerge: 80a28fe 
* commit '80ae285010f0113c663ba06e66108472c57f5883':
  Fix janky in transition doze -> lockscreen
 2014-11-05 18:47:45 +00:00
Andres Morales
5bc105f0e6 am a4341f9c: Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3 automerge: 3bc103b 
* commit 'a4341f9cf33d3844623fbed0f0e998a5f158f67d':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
 2014-11-05 18:47:40 +00:00
George Mount
253c6c47df am 7291d7b2: Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 automerge: dd185b6 
* commit '7291d7b2c58de6670e1fc6a3af4b4b6c200d1ed0':
  Fix javadoc.
 2014-11-05 18:47:33 +00:00
John Spurlock
a667028207 am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260 
* commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 18:47:27 +00:00
John Spurlock
724415fc2e am b16f9437: Merge "QS: Toggle tile icon animations." into lmp-mr1-dev automerge: 2face5e automerge: 055acca 
* commit 'b16f943743716fe36ef1fca71a2d9f52da387e41':
  QS: Toggle tile icon animations.
 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
Tyler Gunn
d331e4ec26 Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5 
automerge: 0bfb97c

* commit '0bfb97cddfadcc0d580bca78c4368efac4edd23e':
  Support disconnecting conference participants from conference.
 2014-11-05 18:08:37 +00:00
Jorim Jaggi
80ae285010 Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c 
automerge: 80a28fe

* commit '80a28fe8d69cbf629a6f8cca23de9fc6e7673326':
  Fix janky in transition doze -> lockscreen
 2014-11-05 18:06:27 +00:00
Andres Morales
a4341f9cf3 Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3 
automerge: 3bc103b

* commit '3bc103b8dbcacf908e6512b805c89a399a460be9':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
 2014-11-05 18:05:14 +00:00
George Mount
7291d7b2c5 Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 
automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.
 2014-11-05 18:03:51 +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
Tyler Gunn
4255ec5c57 Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev 2014-11-05 17:03:13 +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
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:42:30 +00:00
John Spurlock
b16f943743 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev automerge: 2face5e 
automerge: 055acca

* commit '055acca7c8691921572f8e9845bd4d46b96c7251':
  QS: Toggle tile icon animations.
 2014-11-05 15:41:12 +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
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
John Spurlock
2face5e2e8 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev 2014-11-05 14:47:03 +00:00
John Spurlock
c6df3cf273 QS: Toggle tile icon animations. 
- New location tile icon animation.
 - New flashlight tile icon animation.
 - New airplane-mode tile icon animation.
 - New color inversion tile icon animation.
 - Remove obsolete static icons.

Bug: 17426910
Change-Id: I51c98979afd46f4cdfc2fd383e80d7bf13c5eeab
 2014-11-05 09:20:16 -05:00
Jorim Jaggi
3e9d9b5953 Fix janky in transition doze -> lockscreen 
Also fix some unnecessary layer creation for dismiss button.

Bug: 18238168
Change-Id: I71989f2a24162e4453781c07e50d6c25fb380089
 2014-11-05 15:08:15 +01:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm". 
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
 2014-11-05 08:46:01 -05:00
Jungshik Jang
4acb768ce8 am af45240b: am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit 'af45240bf06faa649cc60be560159de0d246b6a9':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:33:33 +00:00
Jungshik Jang
af45240bf0 am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '9ae3fe48d912d9135684d435d282fa2bb4929a2e':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:29:24 +00:00
Jungshik Jang
9ae3fe48d9 am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '090354861a92c1cf0c8c2baa438d1b770d67dd9f':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:18:44 +00:00