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

172050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Jungshik Jang
090354861a Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 2014-11-05 05:54:15 +00:00
Alan Viverette
8df94b5659 am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
  Use default token instead of wrapped window manager
 2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager
 2014-11-05 04:56:40 +00:00
Tom Taylor
75cc9816ca am dda73064: am 53a5acd0: am 8da5180d: am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported M 
* commit 'dda730646e82125aecaae60480fb12ffbcb24c24':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:54:24 +00:00
Tom Taylor
67a32788b4 am 42dc4531: am 0e69335f: am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '42dc4531d58250d1113cdebd428f6bd0181c4eb9':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:54:20 +00:00
Alan Viverette
0290aa8465 am c128a576: am 3ea1a3e7: am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit 'c128a576f678e0e4558fb3eea067d3ff85863d26':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:54:15 +00:00
Alan Viverette
6a98dde8df am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '9342b049b9a605b1904e03f904ec3cbf90f7742d':
  Use default token instead of wrapped window manager
 2014-11-05 04:50:50 +00:00
Tom Taylor
dda730646e am 53a5acd0: am 8da5180d: am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Secur 
* commit '53a5acd096e222e5cbab94dfa5d4c5fde257d7f7':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:47:59 +00:00
Tom Taylor
42dc4531d5 am 0e69335f: am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '0e69335f1acc9effe6435a628a7ba44f7073f215':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:47:53 +00:00
Alan Viverette
c128a576f6 am 3ea1a3e7: am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit '3ea1a3e781717dee16e3338db6fc59d1358d76ed':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:47:47 +00:00
Alan Viverette
9342b049b9 Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 2014-11-05 04:44:22 +00:00
Tom Taylor
53a5acd096 am 8da5180d: am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQ 
* commit '8da5180d3debf8bf47e8d19e8d606e38580b0a84':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:41:34 +00:00
Tom Taylor
0e69335f1a am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '77037113a8d654451a3890fecb2e6be4bd679634':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:41:28 +00:00
Alan Viverette
3ea1a3e781 am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit '44eb8b772984164666195ea71c685292b234549a':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:41:23 +00:00
Tom Taylor
8da5180d3d am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection i 
* commit '865a6582462a132c3d579b0cae0792062d76833e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:36:34 +00:00
Tom Taylor
77037113a8 am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'dd41b6292433915b5b470c61476afca11df043e3':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:36:20 +00:00