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

14285 Commits

Author SHA1 Message Date
Chris Wren
0d6aacb802 am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'd4ba216a0f0e7b175fa1aa6a054c6f257cb88c17':
  Avoid race condition in heads up snooze code path.
 2014-12-09 00:18:57 +00:00
Dan Sandler
864fda2cc7 am b3014b0f: am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit 'b3014b0f3ae26c5b8e42bee79600a293787866da':
  RTL support for Lollipop Land.
 2014-12-09 00:18:26 +00:00
Dan Sandler
36d2b5fdf4 am c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit 'c92c94a5b645805372cf1c9d11d9d19dcd71ad91':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-09 00:17:48 +00:00
Justin Harrison
18b4204ee5 am 79e346fe: am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '79e346fe1bdb4f03e318c9f7ff3b3c7178800413':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-09 00:17:39 +00:00
Jason Monk
1bcdba7b1a am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '0538e675db393777ca1090725b71d54d78fce007':
  Make CarrierText handle multi-sim
 2014-12-08 20:29:16 +00:00
Chris Wren
d4ba216a0f am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
  Avoid race condition in heads up snooze code path.
 2014-12-08 19:17:09 +00:00
Dan Sandler
b3014b0f3a am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit '9e3adb821bef924cac5fb21f1e6c539495f3e831':
  RTL support for Lollipop Land.
 2014-12-08 19:16:26 +00:00
Dan Sandler
c92c94a5b6 am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '2f6d30dfe60826027af9b59d80c536e8f424545d':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-08 19:15:06 +00:00
Justin Harrison
79e346fe1b am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '66351d623acfe67033c605cce4a5d52faab3fb96':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-08 19:14:38 +00:00
Jason Monk
0538e675db am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
  Make CarrierText handle multi-sim
 2014-12-08 19:09:10 +00:00
Geoff Mendal
dd4b3c74b1 Import translations. DO NOT MERGE 
Change-Id: I8c505596a581cd34249251e9c5b040eefd049bb4
Auto-generated-cl: translation import
 2014-12-08 07:06:02 -08:00
Justin Harrison
372bba4da5 am ff4f2486: am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit 'ff4f24866cb87c1110fb26bade3b6017d51805f4':
  Revert "Revert "Improve fling physics for recents""
 2014-12-05 21:20:07 +00:00
Chris Wren
ea9abd14dc am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit '0c5ec0e0db3ac8d3d1ed6796ab2bcc9cc37cf5fa':
  Avoid race condition in heads up snooze code path.
 2014-12-05 20:29:10 +00:00
Chris Wren
0c5ec0e0db Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 2014-12-05 20:22:11 +00:00
Justin Harrison
ff4f24866c am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '2b236ab30e479d22c0619670a97c90993307a190':
  Revert "Revert "Improve fling physics for recents""
 2014-12-05 20:19:10 +00:00
Dan Sandler
9e3adb821b am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit '4ca9d738fa3961507a0289cb4e7873701bc04e12':
  RTL support for Lollipop Land.
 2014-12-05 19:44:35 +00:00
Dan Sandler
4ca9d738fa Merge "RTL support for Lollipop Land." into lmp-mr1-dev 2014-12-05 19:36:39 +00:00
Chris Wren
c11baeba20 Avoid race condition in heads up snooze code path. 
The user can still snooze the heads up as its in the process of timing
out.  In this case, mHeadsUp is already null.  We save the package
name so that we can still snooze the package.

Bug: 18639224
Change-Id: I9bcce99a5c912e70a6856b277b61adab9cdcbc33
 2014-12-05 13:53:23 -05:00
Christoph Studer
e89ff72da6 am 501bf216: am 3bf7b80e: am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev 
* commit '501bf216dc9068c8169687437d8d6594cd1e1165':
  Log the state of the notification shade
 2014-12-05 16:26:21 +00:00
Justin Harrison
3300d81d5b am b1ab736f: am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit 'b1ab736f48c68de8c92afb1fb6da22232badfbb8':
  Revert "Improve fling physics for recents"
 2014-12-05 16:26:02 +00:00
Christoph Studer
501bf216dc am 3bf7b80e: am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev 
* commit '3bf7b80e48eb58254a076f5363f1e9e3348abb8c':
  Log the state of the notification shade
 2014-12-05 15:52:00 +00:00
Justin Harrison
b1ab736f48 am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit 'fdb33a08266d95c338c141446c1da09108194281':
  Revert "Improve fling physics for recents"
 2014-12-05 15:51:33 +00:00
Dan Sandler
2f6d30dfe6 am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '7792b714b66e3af57bc243666b7843b0adf9c0b3':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-05 14:33:33 +00:00
Dan Sandler
7792b714b6 Merge "Don't forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 2014-12-05 14:27:27 +00:00
Justin Harrison
66351d623a am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit 'cff6d450dcef733499f584522ae1faa92940366c':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-05 07:48:27 +00:00
Justin Harrison
cff6d450dc Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 2014-12-05 07:42:59 +00:00
Dan Sandler
e63ba4b03d Don't forget to listen for USER_ALL broadcasts. 
The ActivityManager.closeSystemDialogs() call (used by,
among other things, the home button) broadcasts
ACTION_CLOSE_SYSTEM_DIALOGS for UserHandle.USER_ALL, rather
than any one user.

Bug: 18629414
Change-Id: I89bfa3f556866e1b27987be2753ce83fd0313998
 2014-12-05 00:26:24 -05:00
Jorim Jaggi
6944a1621d am 638e8068: am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '638e8068d212ff72b16d11891af0d9ed110bafde':
  Improve fling physics for recents
 2014-12-05 00:13:20 +00:00
Jorim Jaggi
83aeedc895 am b6d16dc5: am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit 'b6d16dc53fab12099af7d6da406f88bf585b0532':
  Fix rounded corners in bottom QS panel.
 2014-12-05 00:13:15 +00:00
Jason Monk
85d61aaa1a am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit 'd601c6c5c38fcbf66ab1cca83fcd2e100ea019aa':
  Make CarrierText handle multi-sim
 2014-12-04 22:38:58 +00:00
Jason Monk
d601c6c5c3 Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 2014-12-04 22:31:58 +00:00
Jason Monk
9ff69bd8f1 Make CarrierText handle multi-sim 
To do this need to handle the subscription id that comes with all
spn broadcasts and concatenate properly as needed.

Bug: 18223317
Change-Id: I2a1cde0a4bf2f50082288cc5cdeb968fa9aa7dd0
 2014-12-04 17:29:12 -05:00
John Spurlock
e578d2aaf8 am c82144fd: am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit 'c82144fd8fd2d6f240b17e7b47b41fe7e198b841':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 21:55:34 +00:00
Jorim Jaggi
638e8068d2 am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '9f44ea8fbcee80816f4ce6eeca2568ccd06d5a15':
  Improve fling physics for recents
 2014-12-04 21:47:35 +00:00
Jorim Jaggi
b6d16dc53f am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit 'd3cf181d57bb7d63ea8dc6834daf8e3c84f1c769':
  Fix rounded corners in bottom QS panel.
 2014-12-04 21:47:28 +00:00
John Spurlock
c82144fd8f am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit '959312701f55c9d098403c332b88b5777daf4e4c':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 21:45:26 +00:00
Winson Chung
e1a96f7fe2 am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit '1c88fc009fb3f7a3b5f085abb6a40cf4d845d662':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 21:24:02 +00:00
Jim Miller
1568aa6ccd am d205d407: am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'd205d407b44b3218579401be4960eda79ce32f67':
  Stop keyguard from spamming the log
 2014-12-04 21:23:58 +00:00
xinhe
a766b75103 am c377c360: am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit 'c377c360e971b07ccb3c2937f23168c88f426640':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:23:53 +00:00
Winson Chung
1c88fc009f am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 21:18:01 +00:00
Jim Miller
d205d407b4 am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'f2b934b42be772d457b3f6e16c95aad1056c502e':
  Stop keyguard from spamming the log
 2014-12-04 21:17:55 +00:00
xinhe
c377c360e9 am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '9a4472bf45044082f4fa6d906530f3640761676a':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:17:50 +00:00
Dan Sandler
f5ba6bdafa RTL support for Lollipop Land. 
Since the game randomly flips horizontally anyway, forcing
the game view to LTR fixes the coordinate math without
affecting gameplay. (The score view did need to move to
start instead of left, however.)

Bug: 18628150
Change-Id: I7cf8bd1e2b9a2316d30e17a9251173598c687c2b
 2014-12-04 16:07:30 -05:00
Justin Harrison
2b236ab30e am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '70941f203c13bbd475f2434b69155123cf5ae863':
  Revert "Revert "Improve fling physics for recents""
 2014-12-04 20:10:32 +00:00
Justin Harrison
70941f203c Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 2014-12-04 20:05:41 +00:00
Justin Harrison
31d9837284 Revert "Revert "Improve fling physics for recents"" 
This is now BC-triaged, so reverting the revert.

This reverts commit 3f7dac5a1ccf5d464070c1a067d1d50741bdbd0e.

Change-Id: Iae9ffc74a44918a83d9cd4dfb7011810c770e135
 2014-12-04 20:05:21 +00:00
Christoph Studer
3bf7b80e48 am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev 
* commit '391232da084d715b9f20539a98b4a49cc56bf949':
  Log the state of the notification shade
 2014-12-04 18:15:03 +00:00
Christoph Studer
391232da08 Merge "Log the state of the notification shade" into lmp-mr1-dev 2014-12-04 18:09:12 +00:00
Justin Harrison
fdb33a0826 am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit '21af21ca07cd07d7164bf7b7d70513c193785247':
  Revert "Improve fling physics for recents"
 2014-12-04 17:44:42 +00:00
Justin Harrison
21af21ca07 Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 2014-12-04 17:37:55 +00:00