Commit Graph

40333 Commits

Author SHA1 Message Date
Phil Weaver
d88b7364d8 resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0
am: f8a7b8aff0  -s ours

Change-Id: I2430a1e15414366ba054c5d67a31c01e0b3b9725
2017-08-31 17:37:09 +00:00
Phil Weaver
f8a7b8aff0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0

Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204
2017-08-31 17:34:40 +00:00
Phil Weaver
8d9e305d84 resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0  -s ours

Change-Id: Ie761a3c3472ba8ae2c54acc32c1368378bc54fb5
2017-08-31 17:34:39 +00:00
Daniel Nishi
260ec8b9ea Merge "Tint the work icon." into oc-mr1-dev 2017-08-31 17:20:14 +00:00
Julia Reynolds
0c3f4bce57 Add settings page for notification channel groups
Bug: 63927402
Test: tests/unit/src/com/android/settings/notification/.*
Change-Id: Iebf7d8ba54f0cf5801a42f3161354d3cc5e5c848
2017-08-31 11:02:36 -04:00
Zhijun He
d1545e506d Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev am: 13991ff9f3
am: 7b63402f83

Change-Id: Ia7850a88a3582d9383493a58d5e4b617536b81c0
2017-08-31 05:10:20 +00:00
Fan Zhang
42614f1805 Misc icon updates am: 24dc1ab39e
am: cfe72f13dc

Change-Id: I5d311d247199e5cb05b2e9460f47a42cd34aec62
2017-08-31 04:44:02 +00:00
Zhijun He
7b63402f83 Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
am: 13991ff9f3

Change-Id: I47e318a843dcec3192999c2ba168ba646541e3af
2017-08-31 04:25:28 +00:00
Zhijun He
13991ff9f3 Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev 2017-08-31 04:20:59 +00:00
Fan Zhang
cfe72f13dc Misc icon updates
am: 24dc1ab39e

Change-Id: I3db014aa9b51b12226d9f616de73f757cd6f9dd4
2017-08-31 03:24:36 +00:00
Maurice Lam
95eab62479 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e am: 46a04ecca1
am: fe38bfd742

Change-Id: I127d7959ee57d8ada7aaa2ab322cd464dba0a8ea
2017-08-31 02:46:39 +00:00
Maurice Lam
fe38bfd742 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e
am: 46a04ecca1

Change-Id: I865f8da9a0bbf7be9e6ec74b27b55300c604bde0
2017-08-31 02:39:41 +00:00
Maurice Lam
46a04ecca1 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34
am: 61c8796a5e

Change-Id: Ib9c5f652ebafe278ac444a0b3bf9d32aa6b37ac3
2017-08-31 02:33:02 +00:00
Maurice Lam
61c8796a5e Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
2017-08-31 02:10:37 +00:00
Maurice Lam
108611ff34 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" 2017-08-31 02:04:01 +00:00
Jack He
6108d6c22e Bluetooth: do not dimiss fragment when Activity.finish() is called
* When Activity.finish() is called, it's associtated fragments are all
  dismissed automatically
* Cached used fragments are dimissed in onCreate() before new ones are
  created

Bug: 62230203
Test: Pair with Bluetooth device, Settings unit tests
Change-Id: Ieca88ba0660c5407f0d88d572d06a722c642ac39
2017-08-30 18:44:39 -07:00
Fan Zhang
24dc1ab39e Misc icon updates
Fixes: 65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
2017-08-30 17:06:17 -07:00
Phil Weaver
f65e790ba0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
2017-08-30 22:57:39 +00:00
Lei Yu
9260c92c24 Merge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa
am: ec8007b426

Change-Id: I118fee2b974a0815d21d422358250281da9804f0
2017-08-30 17:21:30 +00:00
Lei Yu
ec8007b426 Merge "Add device/profile app check in background check" into oc-mr1-dev
am: f5d7db2cfa

Change-Id: I7ffb1cd690b638f4266b5e37913510f545b780b9
2017-08-30 17:15:02 +00:00
Lei Yu
f5d7db2cfa Merge "Add device/profile app check in background check" into oc-mr1-dev 2017-08-30 17:02:21 +00:00
Bill Yi
68007aa1d5 Import translations. DO NOT MERGE am: ef5d680cc4 -s ours
am: 148fc939ec  -s ours

Change-Id: Ia39834c2fca1f9f21c435131e386acf1fcae7621
2017-08-30 02:55:24 +00:00
TreeHugger Robot
fd1f10640f Merge "Move tests from tests/app/ to tests/unit/" 2017-08-30 01:58:35 +00:00
Bill Yi
148fc939ec Import translations. DO NOT MERGE
am: ef5d680cc4  -s ours

Change-Id: Ifd5d14c131d2df9f80201145b4cbc244d40b768b
2017-08-30 00:47:17 +00:00
jackqdyulei
00015fbf50 Add device/profile app check in background check
If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code

Bug: 64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac
2017-08-29 16:10:36 -07:00
TreeHugger Robot
7c2aebc2b7 Merge "Fix power usage detail page is launched in wrong user" 2017-08-29 22:42:47 +00:00
Doris Ling
d47606ab6d Move tests from tests/app/ to tests/unit/
- second round, move all remaining items
- removed SoundSettingsIntegrationTest and DashboardAdapterTest as they
are obsolete.

Fixes: 62103184
Test: make SettingsUnitTests
Change-Id: Idc2eeb285acd209ef2d00c5451fff697002e1734
2017-08-29 15:32:53 -07:00
Bill Yi
ef5d680cc4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I334be8406b13c2b00047753ed84f62cf6ae71fbd
2017-08-29 14:36:06 -07:00
Daniel Nishi
1568c56de9 Tint the work icon.
Bug: 64475406
Test: Manual
Change-Id: Ibe817a9c099439db91aca1a858e5cf5562fa6a4a
2017-08-29 13:55:06 -07:00
Colin Cross
1ef4caaf3f Fix errorprone build
Fixes:
packages/apps/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java:95: error: [MockitoCast] A bug in Mockito will cause this test to fail at runtime with a ClassCastException
        when(mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);
            ^
    (see http://errorprone.info/bugpattern/MockitoCast)
  Did you mean 'when((Object) mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);'?

packages/apps/Settings/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java:195: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
    public void testBindViewElements_appSearchResult() {
                ^
    (see http://errorprone.info/bugpattern/JUnit4TestNotRun)
  Did you mean '@Test'?

Bug: 64489631
Test: m -j RUN_ERROR_PRONE=true javac-check
Merged-In: I79477f331ae447d2505a1519da09886bf07ba1a2
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I8fd30fc741927de3f6527aca6d98d8851ef23794
2017-08-29 12:57:06 -07:00
Steven Timotius
781d2c4a5a Merge "Fix to show correct value for data limit setting" into oc-mr1-dev am: 99d524e52b
am: 83018be30d

Change-Id: I920b3a94ac65a94d165fad18dbdc3bec8b63a59c
2017-08-29 19:49:14 +00:00
Steven Timotius
83018be30d Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
am: 99d524e52b

Change-Id: I5f8c8ef2fa9f1fe8cb2329c7f8603441b26d36a7
2017-08-29 19:36:42 +00:00
TreeHugger Robot
99d524e52b Merge "Fix to show correct value for data limit setting" into oc-mr1-dev 2017-08-29 19:28:31 +00:00
Matthew Fritze
98a86c01d6 Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev am: 3042af11f0
am: 2980aecd96

Change-Id: I092b68b491669505dc2e46029d19c1fcc4061836
2017-08-29 19:03:11 +00:00
Matthew Fritze
2980aecd96 Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
am: 3042af11f0

Change-Id: I95fc4f482d864f6bf8283b10236b74bd8cddf9e1
2017-08-29 18:51:41 +00:00
TreeHugger Robot
3042af11f0 Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev 2017-08-29 18:42:25 +00:00
TreeHugger Robot
69ad36d628 Merge "Modify notification string." 2017-08-29 17:59:32 +00:00
Steven Timotius
4ccfa7c163 Fix to show correct value for data limit setting
Bug: 64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
(cherry picked from commit 72ebf8fe35)
2017-08-29 16:55:05 +00:00
Matthew Fritze
21aed344fc Prevent race condition between SavedQuery and Query Loader
SearchFragment and SavedQueryLoader share a loader manager
and had been using the same loader id for different
loaders.

Occaisionally (in monkey tests) two loaders with the same
IDs would be started and crash when they finished.

The loaders now have different IDs.

Change-Id: I11e9b7365605fbcef44cf7d2323183415422f5c8
Fixes: 64756515
Test: robotests
2017-08-29 08:20:51 -07:00
yuemingw
6b6d9fd979 Modify notification string.
Bug: 30432840
Test: Reproduced the problem by clicking 'Install from SD card' and the
new notification string appears instead of the old one.

Change-Id: I38a6fc6212aa283f8a899c28db81d8dae4245396
2017-08-29 14:06:31 +01:00
Tony Mak
49aea6af1f Fix power usage detail page is launched in wrong user
Two issues:
1. UID of settings app == system UID. But isSystemUid failed to recognize
Settings in secondary user is also a system uid.
2. For USER drain type, we should launch the detail page in current
   user.

Fix: 64506728
Test: make ROBOTEST_FILTER=AdvancedPowerUsageDetailTest -j40 RunSettingsRoboTests
Test: Switch to seconday user. Go to Settings->Battery, tap owner user
      battery entry, observe that detail page is shown.
Test: Stay long enough in Settings app, make sure no
      either Settings nor Android Framework battery entry.

Change-Id: I8d66ad55f18fcb3d9567b3bf753f737f5b98c609
2017-08-29 11:38:29 +01:00
Sundeep Ghuman
3430553a2e Separate multiple DNS addresses with newlines. am: 2716e841be
am: cf37a26795

Change-Id: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
2017-08-29 04:57:47 +00:00
Sundeep Ghuman
cf37a26795 Separate multiple DNS addresses with newlines.
am: 2716e841be

Change-Id: I676b5de60477f7c905b08b8bb361104e5f1e05b9
2017-08-29 04:49:28 +00:00
Sundeep Ghuman
2716e841be Separate multiple DNS addresses with newlines.
Bug: b/65037256
Test: make -j40 RunSettingsRoboTests
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
2017-08-28 18:47:48 -07:00
Phil Weaver
94c5202965 Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.

Bug: 37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3

Change-Id: I858f3585b2e7d334cddcf38bd0ac6481e778b6b6
2017-08-29 00:57:11 +00:00
Alex Vakulenko
1dec9aa3fd Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev am: 6f72b57428
am: f76056c576

Change-Id: Ibd4c1b1ddcd83e77a9c2a14d7aa6c92f5088e6c4
2017-08-29 00:19:21 +00:00
Alex Vakulenko
f76056c576 Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
am: 6f72b57428

Change-Id: I96f26ec23db34ff642a11cbcdef888fa9e5072bf
2017-08-28 23:45:19 +00:00
TreeHugger Robot
6f72b57428 Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev 2017-08-28 23:15:26 +00:00
jackqdyulei
0617d139e0 Merge "Remove subtitle for Recent location apps" into oc-mr1-dev am: ccbb613fa9
am: f54f8e3d5a

Change-Id: I3f98fe4eb71d456b188d8bfa48c64f6bc3bb2f26
2017-08-28 20:48:57 +00:00
jackqdyulei
f54f8e3d5a Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
am: ccbb613fa9

Change-Id: I7307cbd56949ea995906cc47f67afa660f50d0a0
2017-08-28 20:16:04 +00:00