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
Adam Lesinski
c78fe99e09
Update FakeUid to match ag/2099507
...
Bug: 36002715
Change-Id: I6c2a92bee1a9931e08e11596d9a31844a3bc6bfc
Test: builds
2017-04-12 12:32:24 -07: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
Chris Tate
02883b0217
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev am: 763bfea530
...
am: 3185371382
2017-04-12 19:23:27 +00:00
Daniel Nishi
25b62b1126
Merge "Don't crash in SecondaryUserController." into oc-dev am: aa3685fe14
...
am: 129eb1773a
2017-04-12 19:23:12 +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
Bill Yi
c2e16ca9f6
Merge "Import translations. DO NOT MERGE" into oc-dev am: ec7ebc3f72 -s ours
...
am: 7f51d672c8
2017-04-12 18:56:53 +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
Doris Ling
943b6af1fc
Merge "Allow settings preference title to span over multiple lines." into oc-dev am: d09c7e61f4
...
am: c6f5261619
2017-04-12 18:41:50 +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
Chad Brubaker
5f95b21d9f
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev am: 85eba52794
...
am: c72031f323
2017-04-12 18:05:18 +00:00
Christine Franks
594d15386c
Merge "Use correct title when opening from notification" into oc-dev am: f61d4f38be
...
am: c783d634a3
2017-04-12 18:04:59 +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
Tony Mak
007dc1abe6
Show RingtonePickerActivity in work user instead
...
Test: make RunSettingsRoboTests
Test: Try to import custom ringtone in work profile, no crash observed
Test: Set the custom ringtone as default. Tested both work gmail and
calendar can play that ringtone.
Test: Try to import the peresonal ringtone, it is still working.
Bug: 37197930
Change-Id: I2b662247d7e70b59bae08e082e9682d74d797484
2017-04-12 15:12:44 +01: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
Jesse Evans
de4e056449
Instant apps should not say App Installed by
...
Changes the text on the app installer details to say
"More info on {App Store Name}".
Test: make RunSettingsRoboTests
Bug: 36512295
Change-Id: I8629f840e9f4e5ce12ba91e9cb9def0db0471162
2017-04-12 07:02:19 -07:00
Charles He
c879dfc11f
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev am: 2371009a22
...
am: 38752c4f48
2017-04-12 11:28:15 +00:00
Niels Egberts
4523b38356
Remove unused xml file. am: 07e3f619eb
...
am: 0b51491a46
2017-04-12 11:28:01 +00: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
4b89142256
Save instance to avoid crash opon restore in onCreate.
...
Bug: 37110223
Test: mmma packages/apps/Settings
Change-Id: I82457880bf310efbb7e999a5776858e47b0660c9
2017-04-12 10:42:01 +01: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
395c70370a
Merge "Remove hotspot receiver from manifest." into oc-dev am: 44cfdcc9a7
...
am: 31b6dfdef8
2017-04-12 08:33:40 +00:00
Doris Ling
31b6dfdef8
Merge "Remove hotspot receiver from manifest." into oc-dev
...
am: 44cfdcc9a7
2017-04-12 08:27:20 +00:00
TreeHugger Robot
44cfdcc9a7
Merge "Remove hotspot receiver from manifest." into oc-dev
2017-04-12 08:20:06 +00:00
Amin Shaikh
27ea581cbe
Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
...
am: 35caf331df
2017-04-12 04:59:20 +00:00
Suprabh Shukla
fdc69a5452
Merge "Renaming intent action for unknown sources" into oc-dev am: 3fa963b28e
...
am: eb2e6c7add
2017-04-12 04:55:28 +00:00
Amin Shaikh
35caf331df
Merge "Wi-Fi network details page fixes." into oc-dev
...
am: 52cf25d03d
2017-04-12 04:50:14 +00:00
Suprabh Shukla
eb2e6c7add
Merge "Renaming intent action for unknown sources" into oc-dev
...
am: 3fa963b28e
2017-04-12 04:45:58 +00:00
TreeHugger Robot
52cf25d03d
Merge "Wi-Fi network details page fixes." into oc-dev
2017-04-12 04:40:11 +00:00
Suprabh Shukla
3fa963b28e
Merge "Renaming intent action for unknown sources" into oc-dev
2017-04-12 04:32:51 +00:00
Fan Zhang
888bc4694e
Merge "Add placeholder summary to stablize app info pref height" into oc-dev am: 0bc2aaea70
...
am: 752f902c2a
2017-04-12 02:51:01 +00:00
Fan Zhang
752f902c2a
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
...
am: 0bc2aaea70
2017-04-12 02:45:56 +00:00
