Commit Graph

35050 Commits

Author SHA1 Message Date
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
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
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
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
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
31b6dfdef8 Merge "Remove hotspot receiver from manifest." into oc-dev
am: 44cfdcc9a7

Change-Id: If2461a2b66be0dbc76d6504dc4a8dca12782c86b
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
35caf331df Merge "Wi-Fi network details page fixes." into oc-dev
am: 52cf25d03d

Change-Id: Ic426479331d1946ea697301e2e015852c3d0fa46
2017-04-12 04:50:14 +00:00
Suprabh Shukla
eb2e6c7add Merge "Renaming intent action for unknown sources" into oc-dev
am: 3fa963b28e

Change-Id: I16886b1a1975e06c5593aa513ab09425a302475e
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
752f902c2a Merge "Add placeholder summary to stablize app info pref height" into oc-dev
am: 0bc2aaea70

Change-Id: I5164fc54604abb057e8679d10965e9e0670da084
2017-04-12 02:45:56 +00:00
TreeHugger Robot
0bc2aaea70 Merge "Add placeholder summary to stablize app info pref height" into oc-dev 2017-04-12 02:36:12 +00:00
Fan Zhang
28e5589fcd Merge "Fix nav up button from running process details." into oc-dev
am: 5ebfe92f09

Change-Id: I3fe9ed12b497584d079b94e89ac7cfeec63752e4
2017-04-12 01:35:30 +00:00
Daniel Nishi
cb472bef7b Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
am: 375c22d031

Change-Id: I2672ff3a908272feb1b1e8c2fd8584be745d71f1
2017-04-12 01:35:15 +00:00
TreeHugger Robot
5ebfe92f09 Merge "Fix nav up button from running process details." into oc-dev 2017-04-12 01:25:36 +00:00
TreeHugger Robot
375c22d031 Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev 2017-04-12 01:25:21 +00:00
Andrew Sapperstein
138d38a789 Merge "Remove divider above ExpandPreference." into oc-dev
am: abac8823b2

Change-Id: Id03d2e44fe8da8dc98b1a6694b2281d29c72a04d
2017-04-12 00:20:08 +00:00
TreeHugger Robot
abac8823b2 Merge "Remove divider above ExpandPreference." into oc-dev 2017-04-12 00:03:06 +00:00
Tony Mantler
d9200e5ba4 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249
2017-04-11 23:48:17 +00:00
TreeHugger Robot
69faf046c0 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev 2017-04-11 23:43:27 +00:00
Fan Zhang
007b9e3cdd Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
am: d70abb53ee

Change-Id: I98af02698f46eb483cf5d64380854dd632d26113
2017-04-11 23:43:01 +00:00
Fan Zhang
668dae22e7 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
am: fd29aada6b

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e
2017-04-11 23:42:46 +00:00
TreeHugger Robot
d70abb53ee Merge "Don't show vpn info box when we don't have anything useful" into oc-dev 2017-04-11 23:35:39 +00:00
TreeHugger Robot
fd29aada6b Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev 2017-04-11 23:35:13 +00:00
Amin Shaikh
399e1a5810 Wi-Fi network details page fixes.
- Fix NPE in WifiDetailPreferenceController#setIpText
- Add MAC address preference in the details section
- Set subnet mask and gateway preferences
- Do not show IP information preferences if no information is available
- Fix string capitalization errors
- Only show IPv4 DNS servers under "Network details" section

Bug: 36483230
Bug: 37096448
Bug: 36482499
Bug: 37165860
Test: m RunSettingsRoboTests
Change-Id: I0e3f0ccfc4a8d802b51ed6b3be81c75e384dd06f
2017-04-11 16:25:53 -07:00
Jesse Evans
708a85065d Merge "Fixes instant apps on the Opening links screen" into oc-dev
am: 15f963bed9

Change-Id: I21b6b40c9abb52c52e525000b1e5f063a1c4c475
2017-04-11 22:52:09 +00:00
TreeHugger Robot
15f963bed9 Merge "Fixes instant apps on the Opening links screen" into oc-dev 2017-04-11 22:36:31 +00:00
Christine Franks
e12bf697b0 Use correct title when opening from notification
Bug: 36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.

Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac
2017-04-11 14:57:33 -07:00
Christopher Tate
65cb0d6488 Use bg appop ALLOWED, not DEFAULT
DEFAULT is not actually the right thing; it's a subtlety used for
other things that have compound state.  ALLOWED is the proper
outright "let this thing run free" state for this appop.

Also, set the appop only for the target package, not for the
entire uid.

Bug 37226920
Bug 37242946
Test: make RunSettingsRoboTests

Change-Id: I8c0a995b9519f980685e8573da946dcc93ac4e7c
2017-04-11 14:07:00 -07:00
Julia Reynolds
18fcc05224 Notification sound field updates
- Show default and silent options
- Don't also update the default notification sound
- Display a better summary in case the sound isn't in media store

Change-Id: I42d537657a7bbddb8a1ce41fd03b8e5847899a82
Fixes: 36734113
Fixes: 36849670
Test: manual (silent sound, default sound, normal sound, private sound)
2017-04-11 16:57:57 -04:00