The Android Open Source Project
6979eaaf4e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 882d35715e
2017-08-09 17:14:44 +00:00
TreeHugger Robot
882d35715e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-09 16:46:44 +00:00
Oren Blasberg
aaf5b20eb1
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
...
am: a3a0a1e2e8
2017-08-09 16:06:02 +00:00
TreeHugger Robot
a3a0a1e2e8
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
2017-08-09 15:54:19 +00:00
Adrian Roos
1d192addc6
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
...
am: a147d4a616
2017-08-09 13:55:00 +00:00
Julia Reynolds
5d17c4284d
Merge "Use colorful +s" into oc-mr1-dev
...
am: e286c0627b
2017-08-09 13:54:40 +00:00
TreeHugger Robot
a147d4a616
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
2017-08-09 13:36:40 +00:00
Andrew Sapperstein
d4d55b73ad
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
...
am: 6eafaf46aa
2017-08-09 13:26:31 +00:00
TreeHugger Robot
e286c0627b
Merge "Use colorful +s" into oc-mr1-dev
2017-08-09 13:25:48 +00:00
Andrew Sapperstein
6eafaf46aa
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
...
am: 64b15c4a7b
2017-08-09 13:06:33 +00:00
Adrian Roos
6600ddec73
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
2017-08-09 11:08:13 +00:00
Winston Man
a266a2a0c0
Merge "Move work notification settings back to bottom" into oc-mr1-dev
...
am: 466adba25e
2017-08-09 09:19:43 +00:00
Winston Man
466adba25e
Merge "Move work notification settings back to bottom" into oc-mr1-dev
2017-08-09 09:09:35 +00:00
The Android Open Source Project
8008408285
Import translations. DO NOT MERGE
...
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:14:31 -07:00
Eric Schwarzenbach
06917056fd
Merge "Add modify string to resources." into oc-mr1-dev
...
am: 9e47d2c233
2017-08-09 01:04:33 +00:00
TreeHugger Robot
9e47d2c233
Merge "Add modify string to resources." into oc-mr1-dev
2017-08-09 00:46:57 +00:00
Maurice Lam
b2aa7e7da0
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
...
am: 6b5f99bcbd
2017-08-09 00:02:12 +00:00
TreeHugger Robot
64b15c4a7b
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
2017-08-08 23:59:50 +00:00
Maurice Lam
6b5f99bcbd
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6
...
am: d415cbfc0d
2017-08-08 23:26:20 +00:00
Maurice Lam
d415cbfc0d
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
...
am: dbfde54fb6
2017-08-08 23:05:55 +00:00
Maurice Lam
dbfde54fb6
Merge "Show help string when onEnrollmentHelp() is called"
...
am: 5a926705ef
2017-08-08 22:56:38 +00:00
Fan Zhang
b5989fc3b7
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
...
am: fef5f6aa4a
2017-08-08 22:28:07 +00:00
Salvador Martinez
d76eddacff
Refactor tether logic for reuse am: 135619d483
...
am: 4c2fc34707
2017-08-08 22:18:30 +00:00
TreeHugger Robot
fef5f6aa4a
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
2017-08-08 22:13:13 +00:00
Salvador Martinez
4c2fc34707
Refactor tether logic for reuse
...
am: 135619d483
2017-08-08 22:08:50 +00:00
Maurice Lam
5a926705ef
Merge "Show help string when onEnrollmentHelp() is called"
2017-08-08 22:02:20 +00:00
Salvador Martinez
3c7d47bf87
Refactor tether logic for reuse am: 135619d483 -s ours
...
am: cc92875825
2017-08-08 21:59:50 +00:00
Salvador Martinez
cc92875825
Refactor tether logic for reuse
...
am: 135619d483
2017-08-08 21:53:54 +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
2017-08-08 21:03:32 +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
7f5407e6c9
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
...
am: 101f3d2e44
2017-08-08 20:07:55 +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
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
51aac2af9e
Merge "Add uid data even though on battery stats" into oc-mr1-dev
...
am: 189899c169
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
401156da7d
Merge "Refactor tether logic for reuse" into oc-mr1-dev
...
am: 705a9e7e85
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
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
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
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
2017-08-08 03:07:08 +00:00
Salvador Martinez
e5e1b508f2
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
...
am: b1c0e38284
2017-08-08 03:07:08 +00:00
Salvador Martinez
b32159f242
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
2017-08-08 03:04:45 +00:00
