Noah Wang
d26d3e77a3
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
...
am: 93799e8758
2017-04-13 04:07:11 +00:00
Noah Wang
93799e8758
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
2017-04-13 03:58:47 +00:00
Svet Ganov
6fa685e4da
Merge "Update the strings for the autofill enable dialog" into oc-dev
...
am: 0770f85cdc
2017-04-13 02:04:32 +00:00
TreeHugger Robot
0770f85cdc
Merge "Update the strings for the autofill enable dialog" into oc-dev
2017-04-13 01:56:06 +00:00
Svet Ganov
4fafa4e403
Update the strings for the autofill enable dialog
...
Test: manual
bug:37244333
Change-Id: I6dfac8826d5a817567116ef2f57d646d92b54b4e
2017-04-12 15:17:53 -07:00
Dmitry Dementyev
b3bb79c9ef
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours am: d4d2b47d48 -s ours am: 521e705eaf -s ours
...
am: 53e173c379
2017-04-12 20:59:58 +00:00
Dmitry Dementyev
51741496d3
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours am: d4d2b47d48 -s ours am: 521e705eaf -s ours
...
am: 9aa9976541
2017-04-12 20:37:34 +00:00
Stephen Chen
6455544f6e
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
...
am: de50fff3c2
2017-04-12 20:37:15 +00:00
Dmitry Dementyev
9aa9976541
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours am: d4d2b47d48 -s ours
...
am: 521e705eaf
2017-04-12 20:32:11 +00:00
Dmitry Dementyev
53e173c379
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours am: d4d2b47d48 -s ours
...
am: 521e705eaf
2017-04-12 20:32:11 +00:00
Dmitry Dementyev
521e705eaf
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours
...
am: d4d2b47d48
2017-04-12 20:26:40 +00:00
TreeHugger Robot
de50fff3c2
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
2017-04-12 20:24:22 +00:00
Dmitry Dementyev
d4d2b47d48
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours
...
am: 43e154604a
2017-04-12 20:21:39 +00:00
Dmitry Dementyev
43e154604a
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours
...
am: ed6872b3d5
2017-04-12 20:15:40 +00:00
Dmitry Dementyev
ed6872b3d5
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours
...
am: 89657550ac
2017-04-12 20:10:07 +00:00
Dmitry Dementyev
89657550ac
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours
...
am: 704c02db08
2017-04-12 20:04:11 +00:00
Dmitry Dementyev
704c02db08
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours
...
am: b23bdee761
2017-04-12 20:00:05 +00:00
Dmitry Dementyev
b23bdee761
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours
...
am: 56dc835f3c
2017-04-12 19:54:06 +00:00
Jesse Evans
e1a307eab3
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
...
am: 12c9f41c19
2017-04-12 19:52:54 +00:00
Lei Yu
94cfdcc26c
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
...
am: 171cbf8900
2017-04-12 19:52:20 +00:00
Dmitry Dementyev
56dc835f3c
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours
...
am: 5f32a5b5f3
2017-04-12 19:49:07 +00:00
Dmitry Dementyev
5f32a5b5f3
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours
...
am: 2d9593f8f1
2017-04-12 19:44:05 +00:00
TreeHugger Robot
12c9f41c19
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
2017-04-12 19:39:16 +00:00
Lei Yu
171cbf8900
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
2017-04-12 19:39:08 +00:00
Dmitry Dementyev
2d9593f8f1
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours
...
am: 13b12fd61d
2017-04-12 19:37:33 +00:00
Dmitry Dementyev
13b12fd61d
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours
...
am: 22db6274bf
2017-04-12 19:32:36 +00:00
Dmitry Dementyev
22db6274bf
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
...
am: 0c07b38054
2017-04-12 19:26:32 +00:00
Dmitry Dementyev
0c07b38054
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
...
am: bac5163a9a
2017-04-12 19:21:36 +00:00
Chris Tate
3185371382
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
...
am: 763bfea530
2017-04-12 19:16:52 +00:00
Daniel Nishi
129eb1773a
Merge "Don't crash in SecondaryUserController." into oc-dev
...
am: aa3685fe14
2017-04-12 19:16:22 +00:00
Dmitry Dementyev
bac5163a9a
Add permission check to Intents used by Authenticator Settings.
...
am: ea55e6331e
2017-04-12 19:16:01 +00:00
Chris Tate
763bfea530
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
2017-04-12 18:58:26 +00:00
Daniel Nishi
aa3685fe14
Merge "Don't crash in SecondaryUserController." into oc-dev
2017-04-12 18:57:48 +00:00
Noah Wang
ea5ebaa50c
Prevent gaining audio focus when opening magnification screen.
...
bug: 30521125
Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a
2017-04-12 11:52:23 -07:00
Bill Yi
7f51d672c8
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: ec7ebc3f72
2017-04-12 18:49:57 +00:00
TreeHugger Robot
ec7ebc3f72
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-12 18:37:23 +00:00
Doris Ling
c6f5261619
Merge "Allow settings preference title to span over multiple lines." into oc-dev
...
am: d09c7e61f4
2017-04-12 18:10:41 +00:00
TreeHugger Robot
d09c7e61f4
Merge "Allow settings preference title to span over multiple lines." into oc-dev
2017-04-12 17:57:28 +00:00
Chad Brubaker
c72031f323
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
...
am: 85eba52794
2017-04-12 17:33:45 +00:00
Christine Franks
c783d634a3
Merge "Use correct title when opening from notification" into oc-dev
...
am: f61d4f38be
2017-04-12 17:33:29 +00:00
Chad Brubaker
85eba52794
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
2017-04-12 17:21:09 +00:00
Christine Franks
f61d4f38be
Merge "Use correct title when opening from notification" into oc-dev
2017-04-12 17:19:40 +00:00
jackqdyulei
7f4c5fc1f4
Move bunch of battery methods to BatteryUtils.java
...
This cl moves following methods to BatteryUtils:
1. shouldHideSipper
2. removeHiddenBatterySippers
3. calculateBatteryPercent
As a result, we could use these methods in battery page as well
as app info page.
This cl also move bunch of tests to new file and add test for
method calculateBatteryPercent
Bug: 36816681
Test: RunSettingsRoboTests
Change-Id: Ic32700fe9741fbb96363db4af2d4fccb3ee8e317
2017-04-12 10:10:51 -07:00
Daniel Nishi
06470b68e0
Don't crash in SecondaryUserController.
...
If icons were fetched before displayPreference() is called, it can
cause a NPE. This adds a null check to ensure that it never
attempts to set an icon without both the icon and preference being
non-null.
Change-Id: Ib4269428e64545c9e255f7e3292fb6c046c1f307
Fixes: 37248158
Test: Settings Robotest
2017-04-12 09:33:32 -07:00
Jesse Evans
fef4a43155
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
...
Test: make RunSettingsRoboTests
Change-Id: Iee3a279be6a33932797a5e9378c451feb9b3df1a
2017-04-12 07:03:34 -07:00
Charles He
38752c4f48
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
...
am: 2371009a22
2017-04-12 11:22:47 +00:00
Niels Egberts
0b51491a46
Remove unused xml file.
...
am: 07e3f619eb
2017-04-12 11:22:31 +00:00
TreeHugger Robot
2371009a22
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
2017-04-12 11:20:09 +00:00
Niels Egberts
07e3f619eb
Remove unused xml file.
...
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d
2017-04-12 08:55:21 +00:00
Doris Ling
31b6dfdef8
Merge "Remove hotspot receiver from manifest." into oc-dev
...
am: 44cfdcc9a7
2017-04-12 08:27:20 +00:00
