OSDN Git Service
Adrian Roos [Wed, 9 Aug 2017 14:18:21 +0000 (14:18 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev am:
a147d4a616
am:
1d192addc6
Change-Id: I1f349fbaad0c6807f1e3dccf30fe47b6c48d3eec
Julia Reynolds [Wed, 9 Aug 2017 14:17:57 +0000 (14:17 +0000)]
Merge "Use colorful +s" into oc-mr1-dev am:
e286c0627b
am:
5d17c4284d
Change-Id: Ibe772dacaafd554b51cc9f5340453244106eefee
Adrian Roos [Wed, 9 Aug 2017 13:55:00 +0000 (13:55 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am:
a147d4a616
Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
Julia Reynolds [Wed, 9 Aug 2017 13:54:40 +0000 (13:54 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
am:
e286c0627b
Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
Andrew Sapperstein [Wed, 9 Aug 2017 13:43:06 +0000 (13:43 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b am:
6eafaf46aa
am:
d4d55b73ad
Change-Id: I5cbad3a82c0bc68453034cd00d7e184b97c965a6
TreeHugger Robot [Wed, 9 Aug 2017 13:36:40 +0000 (13:36 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:26:31 +0000 (13:26 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
6eafaf46aa
Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
TreeHugger Robot [Wed, 9 Aug 2017 13:25:48 +0000 (13:25 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:33 +0000 (13:06 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
Adrian Roos [Sun, 23 Jul 2017 12:18:16 +0000 (14:18 +0200)]
FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes:
63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
Winston Man [Wed, 9 Aug 2017 09:25:40 +0000 (09:25 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev am:
466adba25e
am:
a266a2a0c0 -s ours
Change-Id: I03053ee698c00815ae88b8cd8a3c60a28df8849f
Winston Man [Wed, 9 Aug 2017 09:19:43 +0000 (09:19 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
am:
466adba25e
Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
Winston Man [Wed, 9 Aug 2017 09:09:35 +0000 (09:09 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
Eric Schwarzenbach [Wed, 9 Aug 2017 01:18:26 +0000 (01:18 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev am:
9e47d2c233
am:
06917056fd
Change-Id: Ie464ce313d3145b804e53420033a2d705589344f
Eric Schwarzenbach [Wed, 9 Aug 2017 01:04:33 +0000 (01:04 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
am:
9e47d2c233
Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
Maurice Lam [Wed, 9 Aug 2017 00:47:01 +0000 (00:47 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6 am:
d415cbfc0d am:
6b5f99bcbd
am:
b2aa7e7da0
Change-Id: Ia51c480090bc796e8844ac6af04c0b994751603b
TreeHugger Robot [Wed, 9 Aug 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
Maurice Lam [Wed, 9 Aug 2017 00:02:12 +0000 (00:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6 am:
d415cbfc0d
am:
6b5f99bcbd
Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
TreeHugger Robot [Tue, 8 Aug 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
Maurice Lam [Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6
am:
d415cbfc0d
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
Maurice Lam [Tue, 8 Aug 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef
am:
dbfde54fb6
Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
am:
5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
Fan Zhang [Tue, 8 Aug 2017 22:53:23 +0000 (22:53 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev am:
fef5f6aa4a
am:
b5989fc3b7
Change-Id: I189c0936ca9c96d1a686d33bc7da729f6a17d55b
Fan Zhang [Tue, 8 Aug 2017 22:28:07 +0000 (22:28 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am:
fef5f6aa4a
Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
Salvador Martinez [Tue, 8 Aug 2017 22:22:01 +0000 (22:22 +0000)]
Refactor tether logic for reuse am:
135619d483 am:
4c2fc34707 -s ours
am:
d76eddacff -s ours
Change-Id: I4a31f3a870c794b9e348445f419bf08e64d87194
Salvador Martinez [Tue, 8 Aug 2017 22:18:30 +0000 (22:18 +0000)]
Refactor tether logic for reuse am:
135619d483
am:
4c2fc34707 -s ours
Change-Id: I0fc8272a026d188010ce8a613f02cc6c892828c7
TreeHugger Robot [Tue, 8 Aug 2017 22:13:13 +0000 (22:13 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
Salvador Martinez [Tue, 8 Aug 2017 22:08:50 +0000 (22:08 +0000)]
Refactor tether logic for reuse
am:
135619d483
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
Salvador Martinez [Tue, 8 Aug 2017 22:07:21 +0000 (22:07 +0000)]
Refactor tether logic for reuse am:
135619d483 -s ours am:
cc92875825 -s ours
am:
3c7d47bf87 -s ours
Change-Id: I6a6edaa938b521d571415af72424a9684321fb8d
Maurice Lam [Tue, 8 Aug 2017 22:02:20 +0000 (22:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
Salvador Martinez [Tue, 8 Aug 2017 21:59:50 +0000 (21:59 +0000)]
Refactor tether logic for reuse am:
135619d483 -s ours
am:
cc92875825 -s ours
Change-Id: Ifdf63b4f14dffb0cdf4149f228e03dd7807d3562
Salvador Martinez [Tue, 8 Aug 2017 21:53:54 +0000 (21:53 +0000)]
Refactor tether logic for reuse
am:
135619d483 -s ours
Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
Daniel Nishi [Tue, 8 Aug 2017 21:32:19 +0000 (21:32 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev am:
a28dc40543
am:
5abc894236
Change-Id: Id2e67c11a4a52517fe62d46fcd143cfd4248f71e
Eric Schwarzenbach [Tue, 8 Aug 2017 21:11:51 +0000 (14:11 -0700)]
Add modify string to resources.
Bug:
36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
Daniel Nishi [Tue, 8 Aug 2017 21:03:32 +0000 (21:03 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
am:
a28dc40543
Change-Id: I55ba747a08ac5ab6c043a7b53961b1728e4c1a6d
Andrew Sapperstein [Tue, 8 Aug 2017 02:06:57 +0000 (19:06 -0700)]
Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.
Bug:
64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
Daniel Nishi [Tue, 8 Aug 2017 20:46:50 +0000 (20:46 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
Oren Blasberg [Tue, 8 Aug 2017 20:12:20 +0000 (20:12 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev am:
101f3d2e44
am:
7f5407e6c9
Change-Id: I02d6c08efd9df3a5e6815af48136eb03c31072d6
Oren Blasberg [Tue, 8 Aug 2017 20:07:55 +0000 (20:07 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
am:
101f3d2e44
Change-Id: If2e2c15f2672bac1250783376c102b9bda6e1156
Alison Cichowlas [Tue, 8 Aug 2017 20:03:30 +0000 (20:03 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev am:
4068fe7d38
am:
f65c06cf37
Change-Id: I4706e56b885ce01c272d4e582c1b80ce9bfba766
TreeHugger Robot [Tue, 8 Aug 2017 20:02:42 +0000 (20:02 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
Alison Cichowlas [Tue, 8 Aug 2017 19:50:50 +0000 (19:50 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
am:
4068fe7d38
Change-Id: I23f34a35cea64a8f599f3dca2c9a65b8b85d05b1
TreeHugger Robot [Tue, 8 Aug 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
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
jackqdyulei [Tue, 8 Aug 2017 19:31:35 +0000 (19:31 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev am:
189899c169
am:
51aac2af9e
Change-Id: Ifa0cea7bd7f002359924d0cb3385b867557402c6
jackqdyulei [Tue, 8 Aug 2017 19:28:39 +0000 (19:28 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
am:
189899c169
Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
TreeHugger Robot [Tue, 8 Aug 2017 19:22:50 +0000 (19:22 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
Salvador Martinez [Tue, 8 Aug 2017 19:06:03 +0000 (19:06 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev am:
705a9e7e85
am:
401156da7d
Change-Id: I5bb7958452aa24c1b75dfb63b4a5a86a3c7373cc
Salvador Martinez [Tue, 8 Aug 2017 19:02:08 +0000 (19:02 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
am:
705a9e7e85
Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c
TreeHugger Robot [Tue, 8 Aug 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
Daniel Nishi [Thu, 27 Jul 2017 18:06:41 +0000 (11:06 -0700)]
Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
Julia Reynolds [Tue, 8 Aug 2017 18:00:09 +0000 (14:00 -0400)]
Use colorful +s
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes:
63820885
Test: manual
Winston Man [Tue, 8 Aug 2017 13:32:52 +0000 (14:32 +0100)]
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
Alison Cichowlas [Tue, 8 Aug 2017 15:05:23 +0000 (11:05 -0400)]
Add new strings for b/
63109928
Test: Strings only; manual
Bug:
63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
Winston Man [Tue, 8 Aug 2017 13:32:52 +0000 (14:32 +0100)]
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
Salvador Martinez [Tue, 8 Aug 2017 03:22:08 +0000 (03:22 +0000)]
Merge "Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8 am:
b1c0e38284" into oc-mr1-dev-plus-aosp
am:
08e592d8f2
Change-Id: Ifed4ef73f11054bf5eeda2ebfa095764d909bc73
Salvador Martinez [Tue, 8 Aug 2017 03:21:29 +0000 (03:21 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8 am:
b32159f242
am:
0d337881ad
Change-Id: I99e0d6509d49cf31aa17b9e340bd985ec574531b
Android Build Merger (Role) [Tue, 8 Aug 2017 03:07:45 +0000 (03:07 +0000)]
Merge "Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8 am:
b1c0e38284" into oc-mr1-dev-plus-aosp
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b32159f242
Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b1c0e38284
Change-Id: I1f58b6310db52eb0d3286a755e210dfe74c6fc96
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
Salvador Martinez [Thu, 3 Aug 2017 20:56:10 +0000 (13:56 -0700)]
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
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
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
Philip P. Moltmann [Mon, 7 Aug 2017 23:12:15 +0000 (23:12 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev am:
62b6b4d292
am:
03cb6098b2
Change-Id: Ie746547b215648d9f9f7393602594dbde3200b23
Philip P. Moltmann [Mon, 7 Aug 2017 23:06:28 +0000 (23:06 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
am:
62b6b4d292
Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e
TreeHugger Robot [Mon, 7 Aug 2017 22:58:33 +0000 (22:58 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
jackqdyulei [Wed, 26 Jul 2017 20:14:46 +0000 (13:14 -0700)]
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
Peter Qiu [Mon, 7 Aug 2017 20:52:51 +0000 (20:52 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev am:
8d3bfd62e1
am:
d83df9e371
Change-Id: I71253285d1350418a77dd39a94403a18efbb896d
Peter Qiu [Mon, 7 Aug 2017 20:26:23 +0000 (20:26 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
am:
8d3bfd62e1
Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
TreeHugger Robot [Mon, 7 Aug 2017 20:08:31 +0000 (20:08 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 18:50:43 +0000 (18:50 +0000)]
Merge "Move LogPersist to SettingsLib"
Philip P. Moltmann [Wed, 2 Aug 2017 23:40:40 +0000 (16:40 -0700)]
Revoke invidivual permissions
The permission->group mapping is not guaranteed to be stable.
Bug:
64301150
Test: Manually
Change-Id: I44ec5964c01d22d615a9a4717eecabd406392752
Beverly [Mon, 7 Aug 2017 17:27:17 +0000 (17:27 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am:
7fc4dd7e7b
am:
793e3641c0
Change-Id: I3befb0c6aa9911600d3f959748702a57cc899985
Beverly [Mon, 7 Aug 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
am:
7fc4dd7e7b
Change-Id: Ie989acfd2f7896a1160cac32f5e379112737028a
TreeHugger Robot [Mon, 7 Aug 2017 17:16:06 +0000 (17:16 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 17:08:49 +0000 (10:08 -0700)]
wifi: WifiConfigController: fix possible NPE in showSecurityFields
Bug:
64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
Matthew Fritze [Mon, 7 Aug 2017 17:09:08 +0000 (17:09 +0000)]
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
Matthew Fritze [Mon, 7 Aug 2017 17:08:20 +0000 (17:08 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 am:
d1b29a4350 -s ours
am:
4023fdd48d -s ours
Change-Id: I1b1ed19fded781288ee7264d5b190cb09a979882
Android Build Merger (Role) [Mon, 7 Aug 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 -s ours am:
f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
Matthew Fritze [Mon, 7 Aug 2017 17:05:37 +0000 (17:05 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 -s ours
am:
f1398725a8 -s ours
Change-Id: I6d3710f9e399901aa62d69ae9061a5f563d6dd61
Matthew Fritze [Mon, 7 Aug 2017 17:05:20 +0000 (17:05 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395
am:
d1b29a4350 -s ours
Change-Id: Idcc62948fc80573fc49fef10f457841bc5bbd0de
Matthew Fritze [Mon, 7 Aug 2017 17:03:14 +0000 (17:03 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395 -s ours
Change-Id: I888297c779795ad7489be0e7238d2bc5d673610e
Matthew Fritze [Mon, 7 Aug 2017 17:02:19 +0000 (17:02 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395
Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
TreeHugger Robot [Mon, 7 Aug 2017 16:53:29 +0000 (16:53 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
Matthew Fritze [Mon, 7 Aug 2017 15:17:46 +0000 (15:17 +0000)]
Expose Location toggling logic am:
6593453d59
am:
1857058348
Change-Id: Iea2cb9fe6a7f54ab93617e84e23327657b047bdc
Matthew Fritze [Mon, 7 Aug 2017 15:15:41 +0000 (15:15 +0000)]
Expose Location toggling logic
am:
6593453d59
Change-Id: Ic29118bac8ba7462e2f1dc889b4c6878e7a0e8ae
Beverly [Fri, 4 Aug 2017 17:41:23 +0000 (13:41 -0400)]
Uninstall app through notif closes app settings.
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes:
62051546
Test: manual
Bill Yi [Mon, 7 Aug 2017 06:30:53 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours am:
335a436998 -s ours am:
cf297dcca3 -s ours
am:
7f49c85987 -s ours
Change-Id: Ie0964faf1680df7bf0352b57aa6cf7e5fe767dfd
Bill Yi [Mon, 7 Aug 2017 06:22:10 +0000 (06:22 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours am:
335a436998 -s ours
am:
cf297dcca3 -s ours
Change-Id: Id81f76f748bace0d87d03e2f5ff31dcc9f32750d
Bill Yi [Mon, 7 Aug 2017 06:02:28 +0000 (06:02 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours
am:
335a436998 -s ours
Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
Bill Yi [Mon, 7 Aug 2017 05:50:24 +0000 (05:50 +0000)]
Import translations. DO NOT MERGE
am:
c89d5b0093 -s ours
Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
Matthew Fritze [Tue, 1 Aug 2017 00:16:27 +0000 (17:16 -0700)]
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
Matthew Fritze [Sun, 6 Aug 2017 20:55:07 +0000 (20:55 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am:
688e5438dd
am:
a9dfbcee2b
Change-Id: I98d2aeff732b36e925591a820a63711ceddff066
Matthew Fritze [Sun, 6 Aug 2017 20:52:37 +0000 (20:52 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
am:
688e5438dd
Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
TreeHugger Robot [Sun, 6 Aug 2017 20:46:27 +0000 (20:46 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
Bill Yi [Sun, 6 Aug 2017 17:38:44 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 05:02:30 +0000 (05:02 +0000)]
Import translations. DO NOT MERGE am:
57c8508960 -s ours
am:
e9376927a0 -s ours
Change-Id: I0f2d6622f86448cf4ad3f67a8304a091b08be790
Bill Yi [Sun, 6 Aug 2017 04:55:27 +0000 (04:55 +0000)]
Import translations. DO NOT MERGE
am:
57c8508960 -s ours
Change-Id: I813ef1adb4ab7dac7fa61572aa9835f6fbc8187d
Bill Yi [Sun, 6 Aug 2017 02:27:58 +0000 (19:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import