Richard Ho
924b83540b
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
...
am: 07a375186e
2016-06-15 21:19:08 +00:00
Richard Ho
07a375186e
Merge "added null check in doInBackground and if null, properly intializes variables." into nyc-dev
2016-06-15 21:06:07 +00:00
Richard Ho
8c4e4b0865
added null check in doInBackground and if null, properly intializes
...
variables.
Bug:29234237
Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085
(cherry picked from commit 0f0f5414f4
2016-06-15 11:17:58 -07:00
Julia Reynolds
66e87fec8c
Merge \"Revert \"Announce access point changes.\"\" into nyc-dev
...
am: a64e3a0844
2016-06-14 20:54:17 +00:00
Julia Reynolds
a64e3a0844
Merge "Revert "Announce access point changes."" into nyc-dev
2016-06-14 20:42:15 +00:00
Julia Reynolds
8897a5044b
Revert "Announce access point changes."
...
Fixes: 29151018
This reverts commit 7ed62eb7a2
2016-06-14 17:29:54 +00:00
Mark Salyzyn
514ecdf957
Settings: add logpersist selection (strings)
...
(cherry picked from commit 954ed57091a6471f1873c9954fbb16a4f65a25b5)
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
2016-06-09 15:06:28 -07:00
Bill Yi
2373132065
Import translations. DO NOT MERGE
...
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
2016-06-08 22:27:34 -07:00
Jason Monk
a62da52365
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
...
am: 27eadb6f1d
2016-06-08 19:15:34 +00:00
Jason Monk
27eadb6f1d
Merge "Settings: Better handling for disabled tiles" into nyc-dev
2016-06-08 19:10:10 +00:00
Ricky Wai
dfe00c9ed6
Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev
...
am: 18c8690b7e
2016-06-08 14:46:29 +00:00
Ricky Wai
18c8690b7e
Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev
2016-06-08 14:33:56 +00:00
Jason Monk
fcad09a777
Settings: Better handling for disabled tiles
...
Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.
Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209
2016-06-08 09:09:06 -04:00
Baligh Uddin
460b95639e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21
2016-06-07 20:49:52 -07:00
Ricky Wai
b87b0edfb3
Make Settings->Apps can handle work apps even work profile not enabled yet
...
Bug: 29090660
Change-Id: I74f79a4939fac16a09c7991181dc25e1ba4e5edc
2016-06-07 14:52:11 +00:00
Bill Yi
f0807602e7
Import translations. DO NOT MERGE
...
Change-Id: I439834e3adbbd35aa0094caaf66776cf03e84276
Auto-generated-cl: translation import
2016-06-06 18:38:01 -07:00
TreeHugger Robot
93bc210b3f
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 17:53:28 +00:00
Sudheer Shanka
8ebc6e80b8
Merge "Avoid triggering support dialog in non-current user." into nyc-dev
...
am: 5548733eb5
2016-06-03 17:13:03 +00:00
TreeHugger Robot
5548733eb5
Merge "Avoid triggering support dialog in non-current user." into nyc-dev
2016-06-03 17:02:53 +00:00
Bill Yi
29e1099f93
Import translations. DO NOT MERGE
...
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
2016-06-03 09:16:16 -07:00
Sudheer Shanka
54cb63c182
Avoid triggering support dialog in non-current user.
...
Bug: 28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
2016-06-03 08:26:04 -07:00
Ian Rogers
ecc799a076
Merge "Fix call to equals that could never succeed." into nyc-dev
...
am: 748620e9f0
2016-06-01 22:20:47 +00:00
Ian Rogers
3e4885d333
Fix call to equals that could never succeed.
...
Caught by Error Prone.
Bug: 29045331
Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit edf2f5747b
2016-06-01 16:27:28 +00:00
Bill Yi
2f263ac711
Import translations. DO NOT MERGE
...
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
2016-06-01 06:09:15 -07:00
Bill Yi
650a11a2dd
Import translations. DO NOT MERGE
...
Change-Id: Idaa6156bb45c7c8c23f7b9b66910bcbf7a774ab1
Auto-generated-cl: translation import
2016-05-30 11:53:22 -07:00
Julia Reynolds
901bdeadef
Merge "Importance slider updates." into nyc-dev
...
am: 2bf73e94c3
2016-05-26 17:36:52 +00:00
TreeHugger Robot
9aed8c2fa0
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-26 17:07:55 +00:00
Julia Reynolds
3aa969f68d
Importance slider updates.
...
Icon & tint.
Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
2016-05-26 11:07:49 -04:00
Bill Yi
3a97b5e245
Import translations. DO NOT MERGE
...
Change-Id: I1565d077d00cddf65bcda9034194a020a1a61e7d
Auto-generated-cl: translation import
2016-05-25 15:53:43 -07:00
Jason Monk
ae8b7259f5
Merge "Make battery labels translatable." into nyc-dev
...
am: 14abed66d7
2016-05-23 20:07:08 +00:00
Jason Monk
14abed66d7
Merge "Make battery labels translatable." into nyc-dev
2016-05-23 19:58:49 +00:00
Jason Monk
b8d6fcb552
Make battery labels translatable.
...
Bug: 28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc
2016-05-23 14:42:23 -04:00
Bill Yi
ea28bc9461
Import translations. DO NOT MERGE
...
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
2016-05-23 06:21:44 -07:00
Baligh Uddin
f61b6ae1b4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28857042
Change-Id: If486d4168089e018bea1f2acbdbccb2846ee9250
2016-05-21 12:39:28 -07:00
Sanket Agarwal
29c7056f25
While turning OFF do not honor ON requests.
...
am: 090bf55130
2016-05-19 18:32:21 +00:00
Sanket Agarwal
090bf55130
While turning OFF do not honor ON requests.
...
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.
This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.
Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
2016-05-19 18:27:27 +00:00
Baligh Uddin
aebe22dbc3
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 18:56:45 +00:00
Sudheer Shanka
6c505ecdd6
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
...
am: 0d902adbbc
2016-05-18 17:14:25 +00:00
Sudheer Shanka
93f8fd714a
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
...
Bug: 28269827
Change-Id: Ib4a1441b71986ca6637a9236136b60e18dbc1643
2016-05-17 13:27:27 -07:00
Baligh Uddin
b07399fd73
Import translations. DO NOT MERGE
...
Change-Id: I6803d5388c5e4c7fa188d908f35962170c4da1dc
Auto-generated-cl: translation import
2016-05-16 23:23:56 -07:00
Sudheer Shanka
63e3e038c4
Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev
...
am: f7a2afb4fc
2016-05-11 19:12:38 +00:00
Sudheer Shanka
f7a2afb4fc
Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev
2016-05-11 19:04:20 +00:00
Torne (Richard Coles)
4c1639a578
Merge "Change webview developer setting string." into nyc-dev
...
am: bf150eeb75
2016-05-11 16:23:15 +00:00
Torne (Richard Coles)
d3831179c8
Change webview developer setting string.
...
Request from UI to change string to make it clearer.
Bug: 28691051
Change-Id: Ibc2507a0e278994741c43fdadccbbe3e416b2e49
2016-05-11 15:52:07 +01:00
Svetoslav Ganov
b472f4c357
Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev
...
am: 01da140ace
2016-05-10 18:56:20 +00:00
Svetoslav Ganov
7e01af4243
Don't throw runtime exceptions for permission flags
...
We were thrwing undocumented runtime exception when
one gets the permission flags - now we just return
default result of the package is gone.
bug:28657926
Change-Id: I42554a86b9304ff83fe9385f3eea930b8ebf0c63
2016-05-10 15:34:36 +00:00
Bill Yi
1d51db6ba8
Import translations. DO NOT MERGE
...
Change-Id: Ia3e265610e5f562a0acfe849e2c7473f2bd44594
Auto-generated-cl: translation import
2016-05-09 06:14:28 -07:00
Bill Yi
3b4672d8ae
Import translations. DO NOT MERGE
...
Change-Id: I15055663e1705ae0e64ca3f4242bbad3748461e4
Auto-generated-cl: translation import
2016-05-05 21:28:01 -07:00
Tony Mak
aded4dbf5e
New settings key and policy transparency for managed profile settings
...
am: c820cc5fb1
2016-05-04 09:47:33 +00:00
Tony Mak
c820cc5fb1
New settings key and policy transparency for managed profile settings
...
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
2016-05-04 09:33:08 +00:00
