Commit Graph

35540 Commits

Author SHA1 Message Date
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  -s ours

Change-Id: I29ab4a6fb0dfbd3f03b9be71f28ff9f36893bc59
2017-04-12 20:04:11 +00:00
Lei Yu
5564e51661 Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev am: 171cbf8900
am: 94cfdcc26c

Change-Id: I84c4fe7eb70a3e6461e8f7d97669721b6d1c2b03
2017-04-12 20:00:45 +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  -s ours

Change-Id: Ie66bdaba9900b112cee1d9503a332b7bbe203283
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  -s ours

Change-Id: Iafcd0d4116683e0b40a9f98ef9ccf3d176ec0b32
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

Change-Id: Id70340013a4a446ff21178aaa143b120f390d71c
2017-04-12 19:52:54 +00:00
Saige McVea
672cb2edc6 Added generic icon and magnification icon to a11y Settings.
Test: Manual

Bug: 36895362

Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
2017-04-12 12:52:21 -07:00
Lei Yu
94cfdcc26c Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
am: 171cbf8900

Change-Id: Id54c001de93286d83883ea6da476fd241acf77cd
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  -s ours

Change-Id: I608a98d05d77b2e755f516ec60c64484c81437da
2017-04-12 19:49:07 +00:00
jackqdyulei
f8e6f43425 Revamp battery Ui in low battery mode
This cl refine battery icon ui in low battery mode:
1. Should show indicator(fixed in ag/2035178)
2. Show bolt icon when charging
3. When battery is low, set battery background as red and indicator
as white.

This cl also includes the field updates for battery.

Bug: 36862496
Test: RunSettingsRoboTests
Change-Id: Ifb2ed339742119bbff78712df09288b895756b1f
2017-04-12 12:47:52 -07: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  -s ours

Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482
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  -s ours

Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5
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  -s ours

Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
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  -s ours

Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
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

Change-Id: Ib784dbd11aea5a94ee8f60d87df8d84bc68c260c
2017-04-12 19:23:27 +00:00
Daniel Nishi
25b62b1126 Merge "Don't crash in SecondaryUserController." into oc-dev am: aa3685fe14
am: 129eb1773a

Change-Id: Iae6c55f2e6f26dc6b147d70c070109398c528636
2017-04-12 19:23:12 +00:00
Dmitry Dementyev
0c07b38054 Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620
2017-04-12 19:21:36 +00:00
Chris Tate
3185371382 Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
am: 763bfea530

Change-Id: I0bc1f8f580aa7a0ee23b1d7fc634053ada12891a
2017-04-12 19:16:52 +00:00
Daniel Nishi
129eb1773a Merge "Don't crash in SecondaryUserController." into oc-dev
am: aa3685fe14

Change-Id: Ic888ee5baf063ab3bc9075292c32fafe612ddb4e
2017-04-12 19:16:22 +00:00
Dmitry Dementyev
bac5163a9a Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
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  -s ours

Change-Id: Ic3cfe45cd41b2c2cf99cce30bff368e973173a5c
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  -s ours

Change-Id: I477d7fad448a809ad164738cf50b2229858a899c
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

Change-Id: I388c45690f8eb59db2d1d590268319ee8b72b983
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

Change-Id: I81b0285f59195911e3b98ca6f4bf8333da9b23a4
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

Change-Id: I3b7eada3708edc919f5f8b883e3d40aedfb72e6e
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

Change-Id: I09962c3046fbb833cf08455593f73ab3ffa761d1
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

Change-Id: Id5ffbd16ec1d0124669bd232a4c0cfa2440106cb
2017-04-12 17:33:45 +00:00
Christine Franks
c783d634a3 Merge "Use correct title when opening from notification" into oc-dev
am: f61d4f38be

Change-Id: I671f893935c908f00464fb97612dd7486c5b3438
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

Change-Id: Ibb7cd0531b98515a86c33487643a587de75f1678
2017-04-12 11:28:15 +00:00
Niels Egberts
4523b38356 Remove unused xml file. am: 07e3f619eb
am: 0b51491a46

Change-Id: I88c28a9ac055ce834eee3ba333ac55b87d9116b0
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

Change-Id: Ifcdac1ef4c6fee959aab46ca2025d2c71a2e657d
2017-04-12 11:22:47 +00:00
Niels Egberts
0b51491a46 Remove unused xml file.
am: 07e3f619eb

Change-Id: If5ab7a6c492d9ad02620ce61a52ddde59829d48b
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

Change-Id: I217c5658ed3197fac32fa9c9fa7458f5e9254fbc
2017-04-12 08:33:40 +00:00