Geoff Mendal
dd4b3c74b1
Import translations. DO NOT MERGE
...
Change-Id: I8c505596a581cd34249251e9c5b040eefd049bb4
Auto-generated-cl: translation import
2014-12-08 07:06:02 -08:00
Geoff Mendal
b9f245d464
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-08 15:02:17 +00:00
Geoff Mendal
eb95370308
Import translations. DO NOT MERGE
...
Change-Id: I0c8df0ef538cc420817e53a5f6513329a50be46a
Auto-generated-cl: translation import
2014-12-08 07:00:01 -08:00
Geoff Mendal
6c5836eca4
Import translations. DO NOT MERGE
...
Change-Id: Ib0681b2f224456a803391c95f1283f41a06e58a7
Auto-generated-cl: translation import
2014-12-08 06:53:32 -08:00
Jason Monk
15a8a1531e
am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev
...
* commit '32eb928c29b5a9ab490f972dd9b52848c95a4709':
QS Wifi panel show icon on secure networks
2014-12-08 14:40:42 +00:00
Jason Monk
32eb928c29
Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev
2014-12-08 14:32:12 +00:00
Geoff Mendal
e734a86b69
Import translations. DO NOT MERGE
...
Change-Id: Ifb7d25104a21beffd196b8d73d3c6c20e3800f9f
Auto-generated-cl: translation import
2014-12-08 06:32:08 -08:00
Jason Monk
b27ec6d37d
QS Wifi panel show icon on secure networks
...
Bug: 18365695
Change-Id: Ib63822643a5b033d8b73591e9b379b3539b8865e
2014-12-08 09:31:00 -05:00
Geoff Mendal
8510d0142c
Import translations. DO NOT MERGE
...
Change-Id: I50002c9d6b9e684be9f69dab0c8318226cbda6b9
Auto-generated-cl: translation import
2014-12-08 06:28:24 -08:00
Jeff Davidson
5b8c5dd41e
am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev
...
* commit '699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7':
Show "Connected via Wi-Fi assistant" for ephemeral networks.
2014-12-06 02:10:54 +00:00
Jeff Davidson
699faa1d8c
Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev
2014-12-06 02:07:00 +00:00
Jinsong Mu
6fac0351ce
am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev
...
* commit 'b3898fbe07b488ba15d696be9d00ccfac66a6a77':
Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
2014-12-05 23:54:00 +00:00
Jinsong Mu
b3898fbe07
Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev
2014-12-05 23:50:02 +00:00
Jason Monk
83bc2aafd7
CarrierText clear itself when no mob. data support
...
Bug: 18552426
Change-Id: I48e7d1434861dc99284bb0b58c023c1d749e513a
2014-12-05 18:09:36 -05: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
Sanket Padawe
49aeee2e79
am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev
...
* commit '0c1a5bea2eb897b3f1d34b9c25ea6ed0bd5ca6eb':
Doing provisioning check for wifi tethering from SystemUI
2014-12-05 20:59:02 +00:00
Sanket Padawe
0c1a5bea2e
Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev
2014-12-05 20:55:52 +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
Wink Saville
36ffb0494d
Add subId as parameter for get/setDataEnabled.
...
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
2014-12-05 11:10:30 -08: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
Jinsong Mu
dc6efdc1c6
Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock.
...
b/18568003
Change-Id: I622ca7c49a8aa712490c8f74fcd7a1ab6d2ead5f
2014-12-05 09:36:19 -08: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
Winson Chung
860e2d86d8
Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)
...
Since we were unloading tasks when the activity was stopped, but only reloading
tasks on the next onCreate()/onNewIntent(), there were cases where the system
would create the activity but then immediately stop and start it (ie. when the
screen is turned off while the activity has resumeWhilePausing=True set in its
manifest). This CL ensures that we reload the tasks with the same state used
the last time the Recents activity was started.
The CL also cleans up some visibility state that was confusing and is no longer
necessary, fixes a small issue with the dismiss button flashing when toggling
Recents quickly, and fixes some cases where the initial stack scroll is set
incorrectly.
2014-12-04 13:49:46 -08: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
Sanket Padawe
a2bf987b74
Doing provisioning check for wifi tethering from SystemUI
...
+ Calling activity which calls provisioning app only if provisioning
is needed.
+ Hiding Hotspot tile from quick settings when screen is locked.
Bug: 18368949
Change-Id: I5b92a7f2d46c8b5d9b323d6a5d49315694c599f7
2014-12-04 13:41:17 -08: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