Julia Reynolds
fabe766958
Use colorful +s
...
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes: 63820885
Test: manual
2017-08-08 14:00:09 -04:00
Fan Zhang
6d479d99a9
Misc fixes for settings
...
- Set device credential's Window flag to be SECURE. This prevents
showing any pattern/pin in recent list.
- Disable tap sound on entity header
Fixes: 64339515
Fixes: 64413598
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
2017-08-08 10:34:03 -07:00
Winston Man
c603a99ba4
Move work notification settings back to bottom
...
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/5683485175971840
Bug: 64436619
Test: RunSettingsRoboTests; manual
Merged-In: Ia665ee5295981e11193e69585232874d1dddba23
Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
2017-08-08 16:17:12 +00:00
Alison Cichowlas
3f9d0f1614
Add new strings for b/63109928
...
Test: Strings only; manual
Bug: 63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
2017-08-08 11:05:23 -04:00
Winston Man
0372e3f258
Move work notification settings back to bottom
...
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/5683485175971840
Bug: 64436619
Test: RunSettingsRoboTests; manual
Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
2017-08-08 14:58:21 +01:00
Salvador Martinez
c40fc310d4
Merge "Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
am: b1c0e38284" into oc-mr1-dev-plus-aosp
...
am: 08e592d8f2
Change-Id: Ifed4ef73f11054bf5eeda2ebfa095764d909bc73
2017-08-08 03:22:08 +00:00
Salvador Martinez
b1a4db26d8
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
am: b32159f242
...
am: 0d337881ad
Change-Id: I99e0d6509d49cf31aa17b9e340bd985ec574531b
2017-08-08 03:21:29 +00:00
Android Build Merger (Role)
08e592d8f2
Merge "Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
am: b1c0e38284" into oc-mr1-dev-plus-aosp
2017-08-08 03:07:45 +00:00
Salvador Martinez
0d337881ad
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
...
am: b32159f242
Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
2017-08-08 03:07:08 +00:00
Salvador Martinez
e5e1b508f2
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
...
am: b1c0e38284
Change-Id: I1f58b6310db52eb0d3286a755e210dfe74c6fc96
2017-08-08 03:07:08 +00:00
Salvador Martinez
b1c0e38284
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
2017-08-08 03:04:45 +00:00
Salvador Martinez
b32159f242
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
2017-08-08 03:04:45 +00:00
Salvador Martinez
a8db5ccea8
Refactor permissions code for bluetooth controller enabler
...
Bluetooth may be disabled for a user. This CL refactors the code
that determines this a bit so we can query that without having to
have the UI open.
Test: robotests still pass
Bug: 62022517
Change-Id: Ic0837d21bdc4007a20d6ad138753d4f5d37ceceb
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-07 17:51:02 -07:00
Salvador Martinez
52da8a79b9
Refactor tether logic for reuse
...
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug: 64092292
Change-Id: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-07 23:14:34 +00:00
Philip P. Moltmann
f4978f6512
Merge "Revoke invidivual permissions" into oc-mr1-dev am: 62b6b4d292
...
am: 03cb6098b2
Change-Id: Ie746547b215648d9f9f7393602594dbde3200b23
2017-08-07 23:12:15 +00:00
Philip P. Moltmann
03cb6098b2
Merge "Revoke invidivual permissions" into oc-mr1-dev
...
am: 62b6b4d292
Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e
2017-08-07 23:06:28 +00:00
TreeHugger Robot
62b6b4d292
Merge "Revoke invidivual permissions" into oc-mr1-dev
2017-08-07 22:58:33 +00:00
jackqdyulei
fe5a771e92
Add uid data even though on battery stats
...
Advacned battery page doesn't show background toggle because it
doesn't get uid from battery stats. This cl make it get uid by
package name even though without battery stats.
Bug: 64049162
Test: RunSettingsRoboTests
Change-Id: Ie0f67ce9d080c02763a8382740e0640a66ce6053
2017-08-07 14:38:21 -07:00
Peter Qiu
3881c09e14
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev am: 8d3bfd62e1
...
am: d83df9e371
Change-Id: I71253285d1350418a77dd39a94403a18efbb896d
2017-08-07 20:52:51 +00:00
Peter Qiu
d83df9e371
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
...
am: 8d3bfd62e1
Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
2017-08-07 20:26:23 +00:00
TreeHugger Robot
8d3bfd62e1
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
2017-08-07 20:08:31 +00:00
TreeHugger Robot
2f8c398165
Merge "Move LogPersist to SettingsLib"
2017-08-07 18:50:43 +00:00
Philip P. Moltmann
3e6222a982
Revoke invidivual permissions
...
The permission->group mapping is not guaranteed to be stable.
Bug: 64301150
Test: Manually
Change-Id: I44ec5964c01d22d615a9a4717eecabd406392752
2017-08-07 11:32:33 -07:00
Beverly
90da133162
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am: 7fc4dd7e7b
...
am: 793e3641c0
Change-Id: I3befb0c6aa9911600d3f959748702a57cc899985
2017-08-07 17:27:17 +00:00
Beverly
793e3641c0
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
...
am: 7fc4dd7e7b
Change-Id: Ie989acfd2f7896a1160cac32f5e379112737028a
2017-08-07 17:21:53 +00:00
TreeHugger Robot
7fc4dd7e7b
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
2017-08-07 17:16:06 +00:00
Peter Qiu
486fc9dca9
wifi: WifiConfigController: fix possible NPE in showSecurityFields
...
Bug: 64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
2017-08-07 10:10:15 -07:00
Matthew Fritze
108c4a490e
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
-s ours am: f1398725a8
-s ours" into oc-mr1-dev-plus-aosp
...
am: ab0fa22e71
-s ours
Change-Id: I6114e3774724de20be3cf3212070afca0ad17ac1
2017-08-07 17:09:08 +00:00
Matthew Fritze
d780e6c06e
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
am: d1b29a4350
-s ours
...
am: 4023fdd48d
-s ours
Change-Id: I1b1ed19fded781288ee7264d5b190cb09a979882
2017-08-07 17:08:20 +00:00
Android Build Merger (Role)
ab0fa22e71
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
-s ours am: f1398725a8
-s ours" into oc-mr1-dev-plus-aosp
2017-08-07 17:06:17 +00:00
Matthew Fritze
13c0095207
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
-s ours
...
am: f1398725a8
-s ours
Change-Id: I6d3710f9e399901aa62d69ae9061a5f563d6dd61
2017-08-07 17:05:37 +00:00
Matthew Fritze
4023fdd48d
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
...
am: d1b29a4350
-s ours
Change-Id: Idcc62948fc80573fc49fef10f457841bc5bbd0de
2017-08-07 17:05:20 +00:00
Matthew Fritze
f1398725a8
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
-s ours
Change-Id: I888297c779795ad7489be0e7238d2bc5d673610e
2017-08-07 17:03:14 +00:00
Matthew Fritze
d1b29a4350
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
2017-08-07 17:02:19 +00:00
TreeHugger Robot
4f0e5f8395
Merge "Expose Location toggling logic" into oc-dr1-dev
2017-08-07 16:53:29 +00:00
Matthew Fritze
059295559c
Expose Location toggling logic am: 6593453d59
...
am: 1857058348
Change-Id: Iea2cb9fe6a7f54ab93617e84e23327657b047bdc
2017-08-07 15:17:46 +00:00
Matthew Fritze
1857058348
Expose Location toggling logic
...
am: 6593453d59
Change-Id: Ic29118bac8ba7462e2f1dc889b4c6878e7a0e8ae
2017-08-07 15:15:41 +00:00
Beverly
2aeff818c8
Uninstall app through notif closes app settings.
...
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
2017-08-07 14:21:36 +00:00
Robin Lee
13e64c9c10
Remove old VPN tests which instrumented Settings
...
This is not actually a Settings test and never was, it just used
Settings as a convenient delivery mechanism for system-level privileges.
Tests for the Settings app should only check that the Settings app
is behaving within its remit, ie. showing system server state and making
the appropriate calls to set up a connection when certain UI elements
are pressed.
Also since the test relies heavily on off-device state it makes a lot
more sense to run as a hostside test and have the same test code
responsible for pushing certificates and network configs to the device
instead of including manual instructions.
For an end-to-end legacy VPN test see ACTS: https://android.googlesource.com/platform/tools/test/connectivity/+/master/acts/tests/google/net/LegacyVpnTest.py
For an end-to-end app VPN test see CTS hostside: https://android.googlesource.com/platform/cts/+/master/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AlwaysOnVpnTest.java
Test: make Settings
Change-Id: Ia105c3ebd2fa5064adc4422bd3d77c3abba55634
Fix: 64040865
2017-08-07 10:56:32 +02:00
Bill Yi
640a6f75b8
Import translations. DO NOT MERGE am: c89d5b0093
-s ours am: 335a436998
-s ours am: cf297dcca3
-s ours
...
am: 7f49c85987
-s ours
Change-Id: Ie0964faf1680df7bf0352b57aa6cf7e5fe767dfd
2017-08-07 06:30:53 +00:00
Bill Yi
7f49c85987
Import translations. DO NOT MERGE am: c89d5b0093
-s ours am: 335a436998
-s ours
...
am: cf297dcca3
-s ours
Change-Id: Id81f76f748bace0d87d03e2f5ff31dcc9f32750d
2017-08-07 06:22:10 +00:00
Bill Yi
cf297dcca3
Import translations. DO NOT MERGE am: c89d5b0093
-s ours
...
am: 335a436998
-s ours
Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
2017-08-07 06:02:28 +00:00
Bill Yi
335a436998
Import translations. DO NOT MERGE
...
am: c89d5b0093
-s ours
Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
2017-08-07 05:50:24 +00:00
Matthew Fritze
6593453d59
Expose Location toggling logic
...
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug: 62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
2017-08-06 14:29:16 -07:00
Matthew Fritze
ef722b029c
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am: 688e5438dd
...
am: a9dfbcee2b
Change-Id: I98d2aeff732b36e925591a820a63711ceddff066
2017-08-06 20:55:07 +00:00
Matthew Fritze
a9dfbcee2b
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
...
am: 688e5438dd
Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
2017-08-06 20:52:37 +00:00
TreeHugger Robot
688e5438dd
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
2017-08-06 20:46:27 +00:00
Bill Yi
c89d5b0093
Import translations. DO NOT MERGE
...
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Bill Yi
1873ef963c
Import translations. DO NOT MERGE am: 57c8508960
-s ours
...
am: e9376927a0
-s ours
Change-Id: I0f2d6622f86448cf4ad3f67a8304a091b08be790
2017-08-06 05:02:30 +00:00
Bill Yi
e9376927a0
Import translations. DO NOT MERGE
...
am: 57c8508960
-s ours
Change-Id: I813ef1adb4ab7dac7fa61572aa9835f6fbc8187d
2017-08-06 04:55:27 +00:00