OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 13 Apr 2017 15:30:26 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 20099035ef  -s ours

Change-Id: I34f2a306df2fc2610a14f98df13aa87c808eb29c

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 15:24:24 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Notification sound field updates" into oc-dev
Julia Reynolds [Thu, 13 Apr 2017 13:13:18 +0000 (13:13 +0000)]
Merge "Notification sound field updates" into oc-dev
am: b40a459031

Change-Id: Ie8b98d89f477c0d5cfc46946ea1bc14735b07c16

7 years agoMerge "Notification sound field updates" into oc-dev
Julia Reynolds [Thu, 13 Apr 2017 13:01:51 +0000 (13:01 +0000)]
Merge "Notification sound field updates" into oc-dev

7 years agoMerge "Show RingtonePickerActivity in work user instead" into oc-dev
Tony Mak [Thu, 13 Apr 2017 12:36:47 +0000 (12:36 +0000)]
Merge "Show RingtonePickerActivity in work user instead" into oc-dev
am: 35f1e055d1

Change-Id: I2a93c30483c6d0bd3bb32b46034bc98f64a808b4

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Apr 2017 12:36:35 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia49d34f5f431aad5bed7ecbdbda5fed2adf95534
Auto-generated-cl: translation import

7 years agoMerge "Show RingtonePickerActivity in work user instead" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)]
Merge "Show RingtonePickerActivity in work user instead" into oc-dev

7 years agoMerge "Prevent gaining audio focus when opening magnification screen." into oc-dev
Noah Wang [Thu, 13 Apr 2017 04:07:11 +0000 (04:07 +0000)]
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
am: 93799e8758

Change-Id: I53c70dcd4986588819f1d7a36337392c4c74748c

7 years agoMerge "Prevent gaining audio focus when opening magnification screen." into oc-dev
Noah Wang [Thu, 13 Apr 2017 03:58:47 +0000 (03:58 +0000)]
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev

7 years agoMerge "Update the strings for the autofill enable dialog" into oc-dev
Svet Ganov [Thu, 13 Apr 2017 02:04:32 +0000 (02:04 +0000)]
Merge "Update the strings for the autofill enable dialog" into oc-dev
am: 0770f85cdc

Change-Id: Ia40ef434f7f67a8942496540360f5a5547eb8255

7 years agoMerge "Update the strings for the autofill enable dialog" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 01:56:05 +0000 (01:56 +0000)]
Merge "Update the strings for the autofill enable dialog" into oc-dev

7 years agoUpdate the strings for the autofill enable dialog
Svet Ganov [Wed, 12 Apr 2017 19:14:28 +0000 (12:14 -0700)]
Update the strings for the autofill enable dialog

Test: manual

bug:37244333

Change-Id: I6dfac8826d5a817567116ef2f57d646d92b54b4e

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:59:58 +0000 (20:59 +0000)]
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  -s ours

Change-Id: I8a5991cbe80fbf507e2758719e67b0265dab8b7d

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:37:34 +0000 (20:37 +0000)]
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  -s ours

Change-Id: I1e768db06e281817ad3dcb08efa18bc012678862

7 years agoMerge "Update "Open networks available" toggle to instead open notification channel...
Stephen Chen [Wed, 12 Apr 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
am: de50fff3c2

Change-Id: I500d13e65b8aa63b62e5eacb750ed2a6a1ffc163

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:32:11 +0000 (20:32 +0000)]
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

Change-Id: Ia5298253f9349ccb3819f5f4eea1c217aef0b326

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:32:11 +0000 (20:32 +0000)]
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

Change-Id: I8ceb64d42fdb7853609ed94a8304ee71ac904e68

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:26:40 +0000 (20:26 +0000)]
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

Change-Id: Ib983d50a3e079c1cf72fddae475d10a441def7dd

7 years agoMerge "Update "Open networks available" toggle to instead open notification channel...
TreeHugger Robot [Wed, 12 Apr 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:21:39 +0000 (20:21 +0000)]
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

Change-Id: I5d559b468d1d6165162d78cbde84b45e05e7b5ec

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:15:40 +0000 (20:15 +0000)]
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

Change-Id: I0aafd94271cab6fd2fb9acebca3c41299ec9550f

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:10:07 +0000 (20:10 +0000)]
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

Change-Id: I3bb7c6e6f2a8abcad3304c43e611df855e79dad9

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:04:11 +0000 (20:04 +0000)]
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

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:00:05 +0000 (20:00 +0000)]
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

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:54:06 +0000 (19:54 +0000)]
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

7 years agoMerge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
Jesse Evans [Wed, 12 Apr 2017 19:52:54 +0000 (19:52 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am: 12c9f41c19

Change-Id: Id70340013a4a446ff21178aaa143b120f390d71c

7 years agoMerge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
Lei Yu [Wed, 12 Apr 2017 19:52:20 +0000 (19:52 +0000)]
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
am: 171cbf8900

Change-Id: Id54c001de93286d83883ea6da476fd241acf77cd

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:49:07 +0000 (19:49 +0000)]
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

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
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

7 years agoMerge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev

7 years agoMerge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
Lei Yu [Wed, 12 Apr 2017 19:39:08 +0000 (19:39 +0000)]
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
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

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours
am: 22db6274bf  -s ours

Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
am: 0c07b38054  -s ours

Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620

7 years agoMerge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
Chris Tate [Wed, 12 Apr 2017 19:16:52 +0000 (19:16 +0000)]
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
am: 763bfea530

Change-Id: I0bc1f8f580aa7a0ee23b1d7fc634053ada12891a

7 years agoMerge "Don't crash in SecondaryUserController." into oc-dev
Daniel Nishi [Wed, 12 Apr 2017 19:16:22 +0000 (19:16 +0000)]
Merge "Don't crash in SecondaryUserController." into oc-dev
am: aa3685fe14

Change-Id: Ic888ee5baf063ab3bc9075292c32fafe612ddb4e

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232

7 years agoMerge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
Chris Tate [Wed, 12 Apr 2017 18:58:26 +0000 (18:58 +0000)]
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev

7 years agoMerge "Don't crash in SecondaryUserController." into oc-dev
Daniel Nishi [Wed, 12 Apr 2017 18:57:47 +0000 (18:57 +0000)]
Merge "Don't crash in SecondaryUserController." into oc-dev

7 years agoPrevent gaining audio focus when opening magnification screen.
Noah Wang [Wed, 12 Apr 2017 00:22:52 +0000 (17:22 -0700)]
Prevent gaining audio focus when opening magnification screen.

bug: 30521125
Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 12 Apr 2017 18:49:57 +0000 (18:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: ec7ebc3f72  -s ours

Change-Id: I477d7fad448a809ad164738cf50b2229858a899c

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 18:37:22 +0000 (18:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Allow settings preference title to span over multiple lines." into oc-dev
Doris Ling [Wed, 12 Apr 2017 18:10:41 +0000 (18:10 +0000)]
Merge "Allow settings preference title to span over multiple lines." into oc-dev
am: d09c7e61f4

Change-Id: I81b0285f59195911e3b98ca6f4bf8333da9b23a4

7 years agoMerge "Allow settings preference title to span over multiple lines." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow settings preference title to span over multiple lines." into oc-dev

7 years agoMerge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
Chad Brubaker [Wed, 12 Apr 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
am: 85eba52794

Change-Id: Id5ffbd16ec1d0124669bd232a4c0cfa2440106cb

7 years agoMerge "Use correct title when opening from notification" into oc-dev
Christine Franks [Wed, 12 Apr 2017 17:33:29 +0000 (17:33 +0000)]
Merge "Use correct title when opening from notification" into oc-dev
am: f61d4f38be

Change-Id: I671f893935c908f00464fb97612dd7486c5b3438

7 years agoMerge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
Chad Brubaker [Wed, 12 Apr 2017 17:21:09 +0000 (17:21 +0000)]
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev

7 years agoMerge "Use correct title when opening from notification" into oc-dev
Christine Franks [Wed, 12 Apr 2017 17:19:40 +0000 (17:19 +0000)]
Merge "Use correct title when opening from notification" into oc-dev

7 years agoMove bunch of battery methods to BatteryUtils.java
jackqdyulei [Tue, 4 Apr 2017 21:34:05 +0000 (14:34 -0700)]
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

7 years agoDon't crash in SecondaryUserController.
Daniel Nishi [Tue, 11 Apr 2017 21:30:33 +0000 (14:30 -0700)]
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

7 years agoShow RingtonePickerActivity in work user instead
Tony Mak [Tue, 11 Apr 2017 19:07:39 +0000 (20:07 +0100)]
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

7 years agoRename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
Jesse Evans [Sat, 8 Apr 2017 00:04:44 +0000 (17:04 -0700)]
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

Test: make RunSettingsRoboTests
Change-Id: Iee3a279be6a33932797a5e9378c451feb9b3df1a

7 years agoMerge "VPN settings: better a11y voice for legacy dialog" into oc-dev
Charles He [Wed, 12 Apr 2017 11:22:47 +0000 (11:22 +0000)]
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
am: 2371009a22

Change-Id: Ifcdac1ef4c6fee959aab46ca2025d2c71a2e657d

7 years agoRemove unused xml file.
Niels Egberts [Wed, 12 Apr 2017 11:22:31 +0000 (11:22 +0000)]
Remove unused xml file.
am: 07e3f619eb

Change-Id: If5ab7a6c492d9ad02620ce61a52ddde59829d48b

7 years agoMerge "VPN settings: better a11y voice for legacy dialog" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 11:20:08 +0000 (11:20 +0000)]
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev

7 years agoRemove unused xml file.
Niels Egberts [Thu, 30 Mar 2017 10:06:37 +0000 (11:06 +0100)]
Remove unused xml file.

Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d485b6c0eed1b7ec10a8dae8d1da08f)

7 years agoMerge "Remove hotspot receiver from manifest." into oc-dev
Doris Ling [Wed, 12 Apr 2017 08:27:20 +0000 (08:27 +0000)]
Merge "Remove hotspot receiver from manifest." into oc-dev
am: 44cfdcc9a7

Change-Id: If2461a2b66be0dbc76d6504dc4a8dca12782c86b

7 years agoMerge "Remove hotspot receiver from manifest." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 08:20:05 +0000 (08:20 +0000)]
Merge "Remove hotspot receiver from manifest." into oc-dev

7 years agoMerge "Wi-Fi network details page fixes." into oc-dev
Amin Shaikh [Wed, 12 Apr 2017 04:50:14 +0000 (04:50 +0000)]
Merge "Wi-Fi network details page fixes." into oc-dev
am: 52cf25d03d

Change-Id: Ic426479331d1946ea697301e2e015852c3d0fa46

7 years agoMerge "Renaming intent action for unknown sources" into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:45:58 +0000 (04:45 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
am: 3fa963b28e

Change-Id: I16886b1a1975e06c5593aa513ab09425a302475e

7 years agoMerge "Wi-Fi network details page fixes." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Wi-Fi network details page fixes." into oc-dev

7 years agoMerge "Renaming intent action for unknown sources" into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev

7 years agoMerge "Add placeholder summary to stablize app info pref height" into oc-dev
Fan Zhang [Wed, 12 Apr 2017 02:45:56 +0000 (02:45 +0000)]
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
am: 0bc2aaea70

Change-Id: I5164fc54604abb057e8679d10965e9e0670da084

7 years agoMerge "Add placeholder summary to stablize app info pref height" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 02:36:11 +0000 (02:36 +0000)]
Merge "Add placeholder summary to stablize app info pref height" into oc-dev

7 years agoMerge "Fix nav up button from running process details." into oc-dev
Fan Zhang [Wed, 12 Apr 2017 01:35:30 +0000 (01:35 +0000)]
Merge "Fix nav up button from running process details." into oc-dev
am: 5ebfe92f09

Change-Id: I3fe9ed12b497584d079b94e89ac7cfeec63752e4

7 years agoMerge "Fake the cache size to be 0 bytes when cleared." into oc-dev
Daniel Nishi [Wed, 12 Apr 2017 01:35:15 +0000 (01:35 +0000)]
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
am: 375c22d031

Change-Id: I2672ff3a908272feb1b1e8c2fd8584be745d71f1

7 years agoMerge "Fix nav up button from running process details." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:25:36 +0000 (01:25 +0000)]
Merge "Fix nav up button from running process details." into oc-dev

7 years agoMerge "Fake the cache size to be 0 bytes when cleared." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:25:21 +0000 (01:25 +0000)]
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev

7 years agoMerge "Remove divider above ExpandPreference." into oc-dev
Andrew Sapperstein [Wed, 12 Apr 2017 00:20:08 +0000 (00:20 +0000)]
Merge "Remove divider above ExpandPreference." into oc-dev
am: abac8823b2

Change-Id: Id03d2e44fe8da8dc98b1a6694b2281d29c72a04d

7 years agoMerge "Remove divider above ExpandPreference." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:03:05 +0000 (00:03 +0000)]
Merge "Remove divider above ExpandPreference." into oc-dev

7 years agoMerge "Fix sketchy usage of new PreferenceScreen" into oc-dev
Tony Mantler [Tue, 11 Apr 2017 23:48:17 +0000 (23:48 +0000)]
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249

7 years agoMerge "Fix sketchy usage of new PreferenceScreen" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:43:26 +0000 (23:43 +0000)]
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev

7 years agoMerge "Don't show vpn info box when we don't have anything useful" into oc-dev
Fan Zhang [Tue, 11 Apr 2017 23:43:01 +0000 (23:43 +0000)]
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
am: d70abb53ee

Change-Id: I98af02698f46eb483cf5d64380854dd632d26113

7 years agoMerge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
Fan Zhang [Tue, 11 Apr 2017 23:42:46 +0000 (23:42 +0000)]
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
am: fd29aada6b

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e

7 years agoMerge "Don't show vpn info box when we don't have anything useful" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:35:37 +0000 (23:35 +0000)]
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev

7 years agoMerge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:35:13 +0000 (23:35 +0000)]
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev

7 years agoWi-Fi network details page fixes.
Amin Shaikh [Fri, 7 Apr 2017 21:01:41 +0000 (14:01 -0700)]
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

7 years agoMerge "Fixes instant apps on the Opening links screen" into oc-dev
Jesse Evans [Tue, 11 Apr 2017 22:52:09 +0000 (22:52 +0000)]
Merge "Fixes instant apps on the  Opening links screen" into oc-dev
am: 15f963bed9

Change-Id: I21b6b40c9abb52c52e525000b1e5f063a1c4c475

7 years agoMerge "Fixes instant apps on the Opening links screen" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 22:36:30 +0000 (22:36 +0000)]
Merge "Fixes instant apps on the  Opening links screen" into oc-dev

7 years agoUse correct title when opening from notification
Christine Franks [Tue, 11 Apr 2017 16:56:09 +0000 (09:56 -0700)]
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

7 years agoUse bg appop ALLOWED, not DEFAULT
Christopher Tate [Tue, 11 Apr 2017 17:52:06 +0000 (10:52 -0700)]
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

7 years agoNotification sound field updates
Julia Reynolds [Tue, 11 Apr 2017 20:55:43 +0000 (16:55 -0400)]
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)

7 years agoFix nav up button from running process details.
Fan Zhang [Tue, 11 Apr 2017 20:40:10 +0000 (13:40 -0700)]
Fix nav up button from running process details.

Change-Id: I08fbbc1dab886dd26e7d780c0fc1b50c98a0e2f8
Fix: 36667083
Test: manual

7 years agoAllow settings preference title to span over multiple lines.
Doris Ling [Tue, 11 Apr 2017 20:17:38 +0000 (13:17 -0700)]
Allow settings preference title to span over multiple lines.

- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.

Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix: 34886787
Test: manual

7 years agoMerge "Sort channels and groups by id" into oc-dev
Julia Reynolds [Tue, 11 Apr 2017 19:43:06 +0000 (19:43 +0000)]
Merge "Sort channels and groups by id" into oc-dev
am: 665c1ced58

Change-Id: I3878ed917d63b9454b332f714ac83054452fab31

7 years agoMerge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
Hyunyoung Song [Tue, 11 Apr 2017 19:42:47 +0000 (19:42 +0000)]
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
am: 9234a34a80

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a

7 years agoRemove divider above ExpandPreference.
Andrew Sapperstein [Tue, 11 Apr 2017 01:30:21 +0000 (18:30 -0700)]
Remove divider above ExpandPreference.

Change-Id: Ib1841d99025af3f97495efd6d6186b328af33f84
Fixes: 36479214
Test: manual, visual update

7 years agoMerge "Sort channels and groups by id" into oc-dev
Julia Reynolds [Tue, 11 Apr 2017 19:18:52 +0000 (19:18 +0000)]
Merge "Sort channels and groups by id" into oc-dev

7 years agoRemove hotspot receiver from manifest.
Doris Ling [Thu, 30 Mar 2017 21:40:25 +0000 (14:40 -0700)]
Remove hotspot receiver from manifest.

The hotspot receiver if used to cancel any tethering alarm set when wifi
ap state changes. Removing it from the manifest, and only register the
receiver when we schedule the tethering alarm.

Change-Id: I97c3be6e2a374949208bbdd4ac5ccc2fabf0291a
Fix: 35968322
Test: make RunSettingsRoboTests

7 years agoDon't show vpn info box when we don't have anything useful
Fan Zhang [Tue, 11 Apr 2017 18:28:11 +0000 (11:28 -0700)]
Don't show vpn info box when we don't have anything useful

Change-Id: I12a71b38486cab8a6a188c299e90a7674926dc98
Fix: 36068109
Test: make RunSettingsRoboTests -j40

7 years agoUpdate "Open networks available" toggle to instead open notification channel preferences.
Stephen Chen [Thu, 6 Apr 2017 21:59:49 +0000 (14:59 -0700)]
Update "Open networks available" toggle to instead open notification channel preferences.

Bug: 36526438
Test: make ROBOTEST_FILTER=NotifyOpenNetworkPreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: Idde3949856d050e62abff2c75a7b7db475a94d99

7 years agoVPN settings: better a11y voice for legacy dialog
Charles He [Tue, 11 Apr 2017 18:37:05 +0000 (19:37 +0100)]
VPN settings: better a11y voice for legacy dialog

Previously, the user input fields in the legacy VPN config dialog would
simply be read out as "edit box", "drop-down list", etc., without
reference to their corresponding labels. This is not optimal for
low-vision users.

In this CL, we add a "labelFor" attribute to the prompt TextView of each
field. The resulting input fields would instead be read out as "edit box
for username", "drop-down list for type", etc., which are much less
ambiguous than before.

Bug: 37202471
Test: make SettingsGoogle and navigate the dialog with TalkBack on
Change-Id: Id23d0563984e3de4a4a3d03a587ca130b50508fc

7 years agoFake the cache size to be 0 bytes when cleared.
Daniel Nishi [Tue, 28 Mar 2017 17:44:37 +0000 (10:44 -0700)]
Fake the cache size to be 0 bytes when cleared.

The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.

It will not be zero if the user exits and comes back, but this
should be fine.

MARK IT ZERO!

Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
(cherry picked from commit bf1f8e9ca74736ea2d795ce918e45c972dfea52c)

7 years agoMerge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
Hyunyoung Song [Tue, 11 Apr 2017 18:11:48 +0000 (18:11 +0000)]
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev

7 years agoFix sketchy usage of new PreferenceScreen
Tony Mantler [Mon, 10 Apr 2017 22:20:59 +0000 (15:20 -0700)]
Fix sketchy usage of new PreferenceScreen

Things get weird if you don't use PreferenceManager#createPreferenceScreen

Bug: 37216851
Test: Compiles and runs
Change-Id: I7cebec133c4f27f7eeda83c95d8acb4823f67dc4

7 years agoMerge "Add textAlignment for preference_widget_summary" into oc-dev
Lei Yu [Tue, 11 Apr 2017 17:34:58 +0000 (17:34 +0000)]
Merge "Add textAlignment for preference_widget_summary" into oc-dev
am: 8bb9f33c6f

Change-Id: Icece4eeeeefa2da5ce0a0d9318757b1270dcfce6

7 years agoMerge "Add textAlignment for preference_widget_summary" into oc-dev
Lei Yu [Tue, 11 Apr 2017 17:10:07 +0000 (17:10 +0000)]
Merge "Add textAlignment for preference_widget_summary" into oc-dev

7 years agoRevert "Revert "Convert BT preference to use TwoTargetPreference""
Fan Zhang [Mon, 10 Apr 2017 23:26:42 +0000 (16:26 -0700)]
Revert "Revert "Convert BT preference to use TwoTargetPreference""

This reverts commit 457c3cbec2cf38a671a101e9c9426b318aff1564.

Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through

Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java

7 years agoUpdate string char limits
Fan Zhang [Tue, 11 Apr 2017 16:27:17 +0000 (16:27 +0000)]
Update string char limits
am: d017f22372

Change-Id: Ia91e931c93a53d77a1c1ad554d60982b0c0c084a