Felipe Leme
b628d1ed53
Removed deprecated BIND_AUTOFILL permission.
...
Test: make -j100 RunSettingsRoboTests
Bug: 37563972
Change-Id: I423f9c6234e8c1898ed66b22e1078c6f91c58422
2017-08-31 14:28:39 -07:00
Amit Mahajan
a00af97ab1
Change to disable mvno data field in ApnEditor if needed.
...
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-08-31 21:01:25 +00:00
Antony Sargent
ec452e58a5
Fix ClassScanner and re-enable CodeInspectionTest tests
...
This fixes the code in ClassScanner for finding all classes in a given
package to not depend on directory entries in the .jar files generated
by the build system. This dependency caused our tests in
CodeInspepectionTest.java to fail when this CL:
https://android-review.googlesource.com/#/c/platform/build/+/456418/
stopped adding directory entries in the .jar files generated by the
build process. Instead of depending on directories being present in the
list of resources provided by the classloader, this CL switches to using
Guava's ClassPath class to enumerate all loadable classes and filter
them to the ones in the package of interest.
Change-Id: I583919096450b61d4816256be280e2f5f1ce2316
Fixes: 64840107
Test: make RunSettingsRoboTests
2017-08-31 14:00:15 -07:00
Alison Cichowlas
3e5c6f718a
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev am: 49d25a0506
...
am: 4010eb294f
2017-08-31 20:23:27 +00:00
Alison Cichowlas
4010eb294f
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
...
am: 49d25a0506
2017-08-31 20:10:19 +00:00
Jack He
0921319824
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1
...
am: 4dddaf18e1
2017-08-31 19:54:20 +00:00
TreeHugger Robot
49d25a0506
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
2017-08-31 19:51:50 +00:00
Jack He
4dddaf18e1
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
...
am: bf66bf30b1
2017-08-31 19:25:33 +00:00
TreeHugger Robot
bf66bf30b1
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
2017-08-31 19:16:50 +00:00
Phil Weaver
c0f77c7e6f
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours am: 8d9e305d84 -s ours
...
am: 60a0a021d1
2017-08-31 19:08:18 +00:00
Daniel Nishi
cdab0de21f
Merge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea
...
am: 270f217c9f
2017-08-31 18:19:33 +00:00
Phil Weaver
37e0c1f3cc
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 am: f8a7b8aff0 -s ours
...
am: d88b7364d8
2017-08-31 18:18:44 +00:00
Phil Weaver
60a0a021d1
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours
...
am: 8d9e305d84
2017-08-31 18:06:49 +00:00
Daniel Nishi
270f217c9f
Merge "Tint the work icon." into oc-mr1-dev
...
am: 260ec8b9ea
2017-08-31 17:46:01 +00:00
Phil Weaver
d88b7364d8
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0
...
am: f8a7b8aff0
2017-08-31 17:37:09 +00:00
Phil Weaver
f8a7b8aff0
resolve merge conflicts of 94c5202965 to oc-dr1-dev
...
am: f65e790ba0
2017-08-31 17:34:40 +00:00
Phil Weaver
8d9e305d84
resolve merge conflicts of 94c5202965 to oc-dr1-dev
...
am: f65e790ba0
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
2017-08-31 05:10:20 +00:00
Fan Zhang
42614f1805
Misc icon updates am: 24dc1ab39e
...
am: cfe72f13dc
2017-08-31 04:44:02 +00:00
Zhijun He
7b63402f83
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
...
am: 13991ff9f3
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
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
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
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
2017-08-31 02:33:02 +00:00
Maurice Lam
61c8796a5e
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
...
am: 108611ff34
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
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
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
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
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
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
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
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
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
