Baligh Uddin
e973bb7182
Import translations. DO NOT MERGE
...
am: ffe930ec76
-s ours
* commit 'ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c':
Import translations. DO NOT MERGE
Change-Id: I7414492ad43d04da52e362c754b3e2d7d86486f1
2016-05-22 23:20:36 +00:00
Baligh Uddin
ffe930ec76
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
2016-05-21 13:10:17 -07:00
Felipe Leme
ec218b75ac
Merge "Defined help page for Data Saver." into nyc-dev
...
am: f8265a8f1e
* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
Defined help page for Data Saver.
Change-Id: I8ee0281525ab7b606bec6262ac2b115cbe31ca2e
2016-05-20 21:33:30 +00:00
Felipe Leme
f8265a8f1e
Merge "Defined help page for Data Saver." into nyc-dev
2016-05-20 21:27:57 +00:00
Jason Monk
cb0e0f9e30
Merge "Protect against monkey crash" into nyc-dev
...
am: d3ce331b94
* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
Protect against monkey crash
Change-Id: I62f6f9968fe9826ee6045277e55773963d333c16
2016-05-20 18:24:36 +00:00
Jason Monk
d3ce331b94
Merge "Protect against monkey crash" into nyc-dev
2016-05-20 18:21:08 +00:00
Jason Monk
fd41b42487
Protect against monkey crash
...
When rebuild comes in after context is no longer valid
Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes: 28875397
2016-05-20 14:15:10 -04:00
Victor Chang
4e47a17a62
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
...
am: 99a88eca78
* commit '99a88eca7840af3cee8ab13a82c12e3217ea6120':
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
Change-Id: I77209cdef4dc285e36d3c632acc3fa6cd9ee1bbf
2016-05-20 17:34:08 +00:00
Victor Chang
99a88eca78
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
2016-05-20 17:19:42 +00:00
Victor Chang
00859bd548
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
...
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
2016-05-20 17:19:29 +00:00
Felipe Leme
cf2c0b1b97
Defined help page for Data Saver.
...
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
2016-05-20 09:08:28 -07:00
Jason Monk
a9dc3a8826
Don\'t use ApplicationsState for summaries
...
am: 290ca6ec5c
* commit '290ca6ec5c1f029bff7a43d1d499359e25a41904':
Don't use ApplicationsState for summaries
Change-Id: I0a458fd54256315333eb5c6bcef809e2b2381a5a
2016-05-20 15:10:20 +00:00
Jason Monk
290ca6ec5c
Don't use ApplicationsState for summaries
...
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.
Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes: 28435146
2016-05-20 09:37:53 -04:00
Sanket Agarwal
63ddec0756
Handle return value when Bluetooth is enabled
...
am: 77ad3c2531
* commit '77ad3c2531c00c7b654162be826e93abb5e4dc75':
Handle return value when Bluetooth is enabled
Change-Id: I5db74292d85d6a8795b2b25afd3c89c3731bd533
2016-05-19 18:32:25 +00:00
Sanket Agarwal
77ad3c2531
Handle return value when Bluetooth is enabled
...
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
2016-05-19 18:27:03 +00:00
Kenny Guy
01891c5bf0
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Iadf215b82f1753c88471acad41ff70fe3242e65a
2016-05-19 11:07:59 +00:00
Kenny Guy
726085c5c7
Merge "Update work challenge background image." into nyc-dev
2016-05-19 11:01:37 +00:00
Baligh Uddin
43a6de268d
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 7ffeda3633
-s ours
* commit '7ffeda3633ee5296e8403da1042ac4e7321a3023':
Import translations. DO NOT MERGE
Change-Id: I613a4c8aba7a51e232985f6025660c71f8dab169
2016-05-18 19:13:59 +00:00
Baligh Uddin
7ffeda3633
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 19:06:53 +00:00
Robert Greenwalt
aae2022cb5
Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9
...
am: eb88257f07
* commit 'eb88257f076323771fd1e9805708441efc2af03f':
Fix register multiple PhoneStateListeners.
Change-Id: Iece8c8bd197ed03835720f31174c710495a5998f
2016-05-18 18:06:49 +00:00
yifan.bai
eb88257f07
Merge "Fix register multiple PhoneStateListeners."
...
am: 91f6b496a9
* commit '91f6b496a99e085d853d684485c8486125f83f45':
Fix register multiple PhoneStateListeners.
Change-Id: I00a37f58a9f2eccb138bbbdee2bc05323e05237a
2016-05-18 18:02:56 +00:00
Robert Greenwalt
91f6b496a9
Merge "Fix register multiple PhoneStateListeners."
2016-05-18 17:54:47 +00:00
Kenny Guy
846e182385
Update work challenge background image.
...
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
2016-05-18 16:14:19 +01:00
Julia Reynolds
d6575bcee2
Merge "Null check." into nyc-dev
...
am: fc1bb74186
* commit 'fc1bb74186c61712041dfa25e446391f7d8904a1':
Null check.
Change-Id: I1a170686d9df0c0094d154b2570f08f6145fe831
2016-05-18 14:10:13 +00:00
Julia Reynolds
fc1bb74186
Merge "Null check." into nyc-dev
2016-05-18 14:02:05 +00:00
Yohei Yukawa
eb84d19de2
Follow class package change: LocaleList
...
am: 1ef9c4afd5
* commit '1ef9c4afd56b534f836c38437624eabaa6691f0b':
Follow class package change: LocaleList
Change-Id: I725ad37be16a6175541a845cf537617f87dab7a1
2016-05-18 02:24:58 +00:00
Yohei Yukawa
1ef9c4afd5
Follow class package change: LocaleList
...
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug: 28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
2016-05-17 16:25:39 -07:00
pkanwar
23e8435899
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
...
am: 4dd2fdf90b
* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
Choose Bluetooth Device window cant't fill screen
Change-Id: I3134f37ab8e0ac3e7367d26141c4a882051e8652
2016-05-17 22:31:15 +00:00
Pankaj Kanwar
4dd2fdf90b
Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev
2016-05-17 22:16:49 +00:00
Julia Reynolds
47beeec10b
Null check.
...
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes: 28531037
2016-05-17 16:14:10 -04:00
pkanwar
956597eaf8
Choose Bluetooth Device window cant't fill screen
...
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.
Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
2016-05-17 12:03:42 -07:00
Felipe Leme
df9714e9de
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
...
am: c769ddd330
* commit 'c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
Implemented onRestrictBackgroundBlacklistChanged().
Change-Id: Ia3bd9fa234c8ccff136e9999b87abf642ecc9d17
2016-05-17 18:43:58 +00:00
TreeHugger Robot
c769ddd330
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
2016-05-17 18:28:21 +00:00
shwetachahar
d16f4fd531
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
...
am: 1cb87b2af5
* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Id9f34074524813aedcf2994fd1a424b5e2b0185c
2016-05-17 14:32:45 +00:00
Shweta Chahar
1cb87b2af5
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
2016-05-17 14:27:09 +00:00
shwetachahar
43d93289ba
Modify the TTS engine preference UI so that the radio button and the TTS
...
engine name are a single focusable element.
Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
2016-05-17 13:56:57 +01:00
yifan.bai
4bf1704650
Fix register multiple PhoneStateListeners.
...
To avoid multiple PhoneStateListeners are registered, when user changes
the tab between SIMs, unregister the previous listener.
Change-Id: I99cf36a2c25bfbb74322b55efc6d751ea96810e5
2016-05-17 09:47:43 +00:00
Baligh Uddin
e5e29d5073
Import translations. DO NOT MERGE
...
Change-Id: I1f10df22a0d22c5408d2c1cc83441e19ffa28405
Auto-generated-cl: translation import
2016-05-16 23:39:18 -07:00
Felipe Leme
b2c4949de7
Implemented onRestrictBackgroundBlacklistChanged().
...
BUG: 28743623
Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
2016-05-16 20:43:12 +00:00
Sudheer Shanka
7cc2fa51d1
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
...
am: 31fb2a7a1d
* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I526e7fe3e9c11bb36babc386c1cbbcb0187e6bbd
2016-05-16 20:22:31 +00:00
Julia Reynolds
edd4824d44
Merge "Fix crash on rotation." into nyc-dev
...
am: 075690875b
* commit '075690875b437822d23dc38df5e1c02564a7b83e':
Fix crash on rotation.
Change-Id: I6bb07ec33e7fa029047d416d758cfa8e6985d3af
2016-05-16 20:19:50 +00:00
TreeHugger Robot
31fb2a7a1d
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
2016-05-16 20:19:07 +00:00
Julia Reynolds
075690875b
Merge "Fix crash on rotation." into nyc-dev
2016-05-16 20:12:06 +00:00
Julia Reynolds
176b28663b
Fix crash on rotation.
...
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes: 28767083
2016-05-16 15:56:15 -04:00
Sudheer Shanka
dc3ed0a5bf
Fix crash in SetupRedactionInterstitial.
...
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
2016-05-16 11:46:34 -07:00
Julia Reynolds
84082aac24
Merge "Catch rule creation exceptions." into nyc-dev
...
am: f1c2e62f4e
* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
Catch rule creation exceptions.
Change-Id: I2d5d9e15f0c86b700b8c3a058e3cf92e36591173
2016-05-16 18:29:21 +00:00
Julia Reynolds
f1c2e62f4e
Merge "Catch rule creation exceptions." into nyc-dev
2016-05-16 18:22:15 +00:00
Clara Bayarri
41db2612ff
Rename requestKeyboardShortcutsHelper
...
am: fcc411c807
* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
Rename requestKeyboardShortcutsHelper
Change-Id: I807f9d504e2a93b2090f22261c9ff911eb3349cc
2016-05-16 15:09:33 +00:00
Julia Reynolds
992422fd5e
Catch rule creation exceptions.
...
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
2016-05-16 09:53:23 -04:00
Clara Bayarri
fcc411c807
Rename requestKeyboardShortcutsHelper
...
Per API Council feedback
Bug: 28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
2016-05-16 14:16:46 +01:00