Commit Graph

16046 Commits

Author SHA1 Message Date
Jesse Evans
774b759ef9 Merge "Instant apps should not say App Installed by" into oc-dev
am: 28371d9c9e

Change-Id: I17c5ee53f16d26e9e01a54e717e1dcc10051650d
2017-04-13 20:03:43 +00:00
TreeHugger Robot
28371d9c9e Merge "Instant apps should not say App Installed by" into oc-dev 2017-04-13 19:36:53 +00:00
Saige McVea
8fb5b5fd0e Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
am: ba7a4751a0

Change-Id: I9c9ca5d2584c923520f9d2d9986fdf28f7aae5d8
2017-04-13 19:18:29 +00:00
Saige McVea
ba7a4751a0 Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev 2017-04-13 19:07:33 +00:00
Daniel Nishi
f6e6991965 Merge "Add a movies & tv apps category to storage settings." into oc-dev
am: c365a8735c

Change-Id: I665759c8ce9c74d83a1167c5d04e5134ff697d08
2017-04-13 18:45:04 +00:00
Daniel Nishi
c365a8735c Merge "Add a movies & tv apps category to storage settings." into oc-dev 2017-04-13 18:39:58 +00:00
Hyunyoung Song
4b9f884fd2 Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev
am: 8399697520

Change-Id: Ie4fe4c452d99a47a6f29bd2a69f5dacd0f84f0e9
2017-04-13 18:38:38 +00:00
Hyunyoung Song
8399697520 Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev 2017-04-13 18:11:50 +00:00
Lei Yu
d03025897d Merge "Update Summary for Battery Optimization" into oc-dev
am: d29cb7e7ea

Change-Id: Ibf37d1256ae71e6f404c660048c6a38278036a9d
2017-04-13 17:46:34 +00:00
Sundeep Ghuman
c8ec4c0e3f Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev
am: 028642e0a9

Change-Id: Ib0be7499de05209823f834c651cd8957ec3ce64c
2017-04-13 17:46:19 +00:00
Lei Yu
d29cb7e7ea Merge "Update Summary for Battery Optimization" into oc-dev 2017-04-13 17:33:04 +00:00
TreeHugger Robot
028642e0a9 Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev 2017-04-13 17:08:40 +00:00
Niels Egberts
5e0d74d80c Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev
am: dc322cf18b

Change-Id: I2644bd82b82b89f15548de58c76c751162122f7f
2017-04-13 16:30:56 +00:00
TreeHugger Robot
dc322cf18b Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev 2017-04-13 16:21:58 +00:00
Hyunyoung Song
06304504cd Remove elevation from Apps detail info view to prevent NPE
b/37286516
Test: manual

Change-Id: Ie3a10c94e79cd11eefafef25ac4ecd244cf67ea9
2017-04-13 08:34:17 -07:00
Julia Reynolds
cd8f4fb614 Merge "Notification sound field updates" into oc-dev
am: b40a459031

Change-Id: Ie8b98d89f477c0d5cfc46946ea1bc14735b07c16
2017-04-13 13:13:18 +00:00
Julia Reynolds
b40a459031 Merge "Notification sound field updates" into oc-dev 2017-04-13 13:01:52 +00:00
Tony Mak
8e413e2a88 Merge "Show RingtonePickerActivity in work user instead" into oc-dev
am: 35f1e055d1

Change-Id: I2a93c30483c6d0bd3bb32b46034bc98f64a808b4
2017-04-13 12:36:47 +00:00
TreeHugger Robot
35f1e055d1 Merge "Show RingtonePickerActivity in work user instead" into oc-dev 2017-04-13 12:13:04 +00:00
Noah Wang
d26d3e77a3 Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
am: 93799e8758

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

Change-Id: Ia40ef434f7f67a8942496540360f5a5547eb8255
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
Sundeep Ghuman
8474a9c877 Add a broadcast receiver to WifiDetailsPreferenceController.
This allows the WifiNetworkDetailsFragment to update dynamically based
on network and connection changes.

Bug: b/36278407
Test: make RunSettingsRoboTests
Change-Id: I388cf9842a144e45b68f2d173c7b29f347226b78
2017-04-12 17:56:58 -07: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
Stephen Chen
6455544f6e Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
am: de50fff3c2

Change-Id: I500d13e65b8aa63b62e5eacb750ed2a6a1ffc163
2017-04-12 20:37:15 +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
jackqdyulei
781c3000d1 Update Summary for Battery Optimization
Bug: 37221696
Test: RunSettingsRoboTests
Change-Id: I7dc24879521a1375e0ad4b4b73e9a40633b93c3f
2017-04-12 13:04:28 -07: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
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
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
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
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
Chad Brubaker
85eba52794 Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev 2017-04-12 17:21:09 +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
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
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