Commit Graph

39566 Commits

Author SHA1 Message Date
Salvador Martinez
cc92875825 Refactor tether logic for reuse
am: 135619d483  -s ours

Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
2017-08-08 21:53:54 +00:00
Daniel Nishi
9a9a4a2d72 Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev am: a28dc40543
am: 5abc894236

Change-Id: Id2e67c11a4a52517fe62d46fcd143cfd4248f71e
2017-08-08 21:32:19 +00:00
Eric Schwarzenbach
b82f51099a Add modify string to resources.
Bug: 36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
2017-08-08 14:11:51 -07:00
Daniel Nishi
5abc894236 Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
am: a28dc40543

Change-Id: I55ba747a08ac5ab6c043a7b53961b1728e4c1a6d
2017-08-08 21:03:32 +00:00
Ruchi Kandoi
1eab553653 Avoid Race condition with accessibility for NFC toggle switch
Bug: 64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
2017-08-08 20:58:29 +00:00
Andrew Sapperstein
5be6c30012 Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.

Bug: 64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
2017-08-08 13:58:18 -07:00
Oren Blasberg
9705aad8db Update SMS mirroring icon to new style.
Test: Verified the icon looks good in Settings.

Bug: 37546615
Change-Id: I313548022fa37676bc0dfee598d45e9f09d5bfb5
2017-08-08 13:49:48 -07:00
Daniel Nishi
a28dc40543 Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev 2017-08-08 20:46:50 +00:00
Oren Blasberg
3e7613546a Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev am: 101f3d2e44
am: 7f5407e6c9

Change-Id: I02d6c08efd9df3a5e6815af48136eb03c31072d6
2017-08-08 20:12:20 +00:00
Oren Blasberg
7f5407e6c9 Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
am: 101f3d2e44

Change-Id: If2e2c15f2672bac1250783376c102b9bda6e1156
2017-08-08 20:07:55 +00:00
Alison Cichowlas
aa62c4f1c7 Merge "Add new strings for b/63109928" into oc-mr1-dev am: 4068fe7d38
am: f65c06cf37

Change-Id: I4706e56b885ce01c272d4e582c1b80ce9bfba766
2017-08-08 20:03:30 +00:00
TreeHugger Robot
101f3d2e44 Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev 2017-08-08 20:02:42 +00:00
Alison Cichowlas
f65c06cf37 Merge "Add new strings for b/63109928" into oc-mr1-dev
am: 4068fe7d38

Change-Id: I23f34a35cea64a8f599f3dca2c9a65b8b85d05b1
2017-08-08 19:50:50 +00:00
TreeHugger Robot
4068fe7d38 Merge "Add new strings for b/63109928" into oc-mr1-dev 2017-08-08 19:36:40 +00:00
Salvador Martinez
135619d483 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: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-08 12:35:20 -07:00
jackqdyulei
0e117ecc28 Merge "Add uid data even though on battery stats" into oc-mr1-dev am: 189899c169
am: 51aac2af9e

Change-Id: Ifa0cea7bd7f002359924d0cb3385b867557402c6
2017-08-08 19:31:35 +00:00
jackqdyulei
51aac2af9e Merge "Add uid data even though on battery stats" into oc-mr1-dev
am: 189899c169

Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
2017-08-08 19:28:39 +00:00
TreeHugger Robot
189899c169 Merge "Add uid data even though on battery stats" into oc-mr1-dev 2017-08-08 19:22:50 +00:00
Salvador Martinez
9c6b2fabb5 Merge "Refactor tether logic for reuse" into oc-mr1-dev am: 705a9e7e85
am: 401156da7d

Change-Id: I5bb7958452aa24c1b75dfb63b4a5a86a3c7373cc
2017-08-08 19:06:03 +00:00
Salvador Martinez
401156da7d Merge "Refactor tether logic for reuse" into oc-mr1-dev
am: 705a9e7e85

Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c
2017-08-08 19:02:08 +00:00
TreeHugger Robot
705a9e7e85 Merge "Refactor tether logic for reuse" into oc-mr1-dev 2017-08-08 18:53:39 +00:00
Daniel Nishi
3ff4b933e6 Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I7c99272f330d9d5fa043c155d2f818e70ac271e0
Merged-In: I0791bdddf0bc97abc21cd27613998247b11d7bb4
2017-08-08 11:37:50 -07:00
Daniel Nishi
fb83e50d99 Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
2017-08-08 11:21:01 -07:00
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