Geoff Mendal
f87d8c85c4
Import translations. DO NOT MERGE am: a27cd9d033
-s ours am: 029c196bf6
-s ours
...
am: 963ed1b38d
-s ours
* commit '963ed1b38d832b37784f48f733b2503ad676620e':
Import translations. DO NOT MERGE
2016-02-10 15:50:08 +00:00
Geoff Mendal
963ed1b38d
Import translations. DO NOT MERGE am: a27cd9d033
-s ours
...
am: 029c196bf6
-s ours
* commit '029c196bf6f60c5d6631119691e6b41d357fde6f':
Import translations. DO NOT MERGE
2016-02-10 15:47:06 +00:00
Geoff Mendal
029c196bf6
Import translations. DO NOT MERGE
...
am: a27cd9d033
-s ours
* commit 'a27cd9d033b557d3ff791260eb51f090d8370218':
Import translations. DO NOT MERGE
2016-02-10 15:43:33 +00:00
Geoff Mendal
a27cd9d033
Import translations. DO NOT MERGE
...
Change-Id: I2c4a21fdb89a240803d39cc929c34ea89686ff4f
Auto-generated-cl: translation import
2016-02-10 07:23:28 -08:00
Geoff Mendal
f53a6c90f3
Import translations. DO NOT MERGE
...
Change-Id: I4879140c3fa74a518309d9f48d3b8ca29411d9f8
Auto-generated-cl: translation import
2016-02-10 06:33:10 -08:00
Jeremy Klein
5d7d3f0f9f
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev am: d119f50314
...
am: 99888fe540
* commit '99888fe540fc1e0f85f27d0f18e6f716caad7a50':
Remove PM query for silent provisioning BroadcastReceiver.
2016-02-10 09:09:57 +00:00
Andre Eisenbach
8c32a90e9c
Add Developer menu entry to disable Bluetooth absolute volume am: 591c6c4f5a
...
am: 42aeccb95e
* commit '42aeccb95e0e716626df06bfde661a02a626cc33':
Add Developer menu entry to disable Bluetooth absolute volume
2016-02-10 09:09:47 +00:00
Jeremy Klein
99888fe540
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
...
am: d119f50314
* commit 'd119f50314c4923529a11dade3248005c26b4cfd':
Remove PM query for silent provisioning BroadcastReceiver.
2016-02-10 02:41:12 +00:00
Jeremy Klein
d119f50314
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
2016-02-10 02:40:05 +00:00
Andre Eisenbach
42aeccb95e
Add Developer menu entry to disable Bluetooth absolute volume
...
am: 591c6c4f5a
* commit '591c6c4f5ac73387dc83e119627344a78fd615c6':
Add Developer menu entry to disable Bluetooth absolute volume
2016-02-10 02:13:20 +00:00
Andre Eisenbach
591c6c4f5a
Add Developer menu entry to disable Bluetooth absolute volume
...
NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .
Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
2016-02-10 01:54:55 +00:00
Andre Eisenbach
9205df540a
Merge "Add Developer menu entry to disable Bluetooth absolute volume" am: 6979c8bbe3
-s ours
...
am: 37561b0e3c
* commit '37561b0e3c9dc64d120c1e5cb4dba1bf39d4a9fd':
Add Developer menu entry to disable Bluetooth absolute volume
2016-02-10 00:08:51 +00:00
Jim Miller
ff6f9c1b92
Fix crash in Settings on devices without fingerprint. am: 017bdceeb4
...
am: 6f5c588e5b
* commit '6f5c588e5bf13583ecf3c6543060aa06a7e6e81e':
Fix crash in Settings on devices without fingerprint.
2016-02-09 23:59:42 +00:00
Andre Eisenbach
37561b0e3c
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
...
am: 6979c8bbe3
-s ours
* commit '6979c8bbe3eeea1e225049a0658a98b85836c076':
Add Developer menu entry to disable Bluetooth absolute volume
2016-02-09 23:55:04 +00:00
Jim Miller
6f5c588e5b
Fix crash in Settings on devices without fingerprint.
...
am: 017bdceeb4
* commit '017bdceeb44aa55ec08033d004bba4f071844dc4':
Fix crash in Settings on devices without fingerprint.
2016-02-09 23:39:55 +00:00
Jeremy Klein
5ebff810ff
Remove PM query for silent provisioning BroadcastReceiver.
...
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
(cherry picked from commit f19aa5574b
)
2016-02-09 23:28:47 +00:00
Jim Miller
017bdceeb4
Fix crash in Settings on devices without fingerprint.
...
Fixes bug 27060816
Change-Id: I3b45d3bfa6e47abb4a43ca95c15fd3614f9478dd
2016-02-09 15:15:32 -08:00
Udam Saini
052319e657
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev am: 40f4bf2a1f
...
am: d36f4e2be2
* commit 'd36f4e2be29f59041f078313b8e42547e3ffeeae':
Adds the headers for choose lock generic inside onCreate
2016-02-09 22:53:11 +00:00
Samuel Tan
c9e2bcf8e2
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920
am: aedb058e1b
...
am: 711b01b80d
* commit '711b01b80dabf096b814b7bbcb1686c462bb3adb':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 22:53:00 +00:00
Jeremy Klein
ccf1821fa8
Merge "Remove PM query for silent provisioning BroadcastReceiver."
2016-02-09 21:44:48 +00:00
Andre Eisenbach
6979c8bbe3
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
2016-02-09 21:20:04 +00:00
Jeremy Klein
f19aa5574b
Remove PM query for silent provisioning BroadcastReceiver.
...
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
2016-02-09 13:11:25 -08:00
Anna Galusza
5df008fd0b
Merge "Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev."
2016-02-09 20:34:30 +00:00
Udam Saini
d36f4e2be2
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
...
am: 40f4bf2a1f
* commit '40f4bf2a1fc9e4c60f44661647f091f6c0e91cb3':
Adds the headers for choose lock generic inside onCreate
2016-02-09 18:50:39 +00:00
Udam Saini
40f4bf2a1f
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
2016-02-09 18:47:13 +00:00
Udam Saini
6de85e80a9
Adds the headers for choose lock generic inside onCreate
...
This will make sure the headers are set before the underlying
RecyclerView has made its first layout, and prevents an animation
from playing when rotating to landscape.
bug:26990364
Change-Id: I2838a07a145b4d6136e88125ab955006d84d135c
2016-02-09 10:32:56 -08:00
Samuel Tan
711b01b80d
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920
...
am: aedb058e1b
* commit 'aedb058e1b46ce559fc6a282820a89dcbc9c15d1':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 18:29:47 +00:00
Samuel Tan
aedb058e1b
Allow trusted system certificates to be used in EAP network configs
...
am: 2b16cd3920
* commit '2b16cd3920f95b2cd5c2426d81b5e1584ffc682d':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 18:24:20 +00:00
Andre Eisenbach
bbf4f66143
Add Developer menu entry to disable Bluetooth absolute volume
...
Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
2016-02-08 17:20:07 -08:00
Anna Galusza
d6717ddccf
Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev.
...
This reverts commit 206a845710
.
Change-Id: I7a773fee68c28f3046a8099fa266183c3c3799ae
2016-02-08 23:28:40 +00:00
Tony Mantler
e6bf755125
Merge "Fix security level display" into nyc-dev am: b42b9045e2
...
am: 2eef414b1d
* commit '2eef414b1d585e0473853a36d1766250f5cb2194':
Fix security level display
2016-02-08 22:43:26 +00:00
Suprabh Shukla
c8bd4a8e61
Merge "Adding an easy uninstall for active device admin"
2016-02-08 22:41:40 +00:00
Anna Galusza
7526c0a3de
Update strings for A11y SUW. am: 0239f95538
...
am: 85657bc86c
* commit '85657bc86c26dc9d6985e2bb4caa967037c521b1':
Update strings for A11y SUW.
2016-02-08 22:41:26 +00:00
Tony Mantler
2eef414b1d
Merge "Fix security level display" into nyc-dev
...
am: b42b9045e2
* commit 'b42b9045e25d24676ef9c3e0cb3b36f2c98d9a10':
Fix security level display
2016-02-08 22:34:50 +00:00
Anna Galusza
85657bc86c
Update strings for A11y SUW.
...
am: 0239f95538
* commit '0239f95538b572c7951cac65707d906ef051bbf3':
Update strings for A11y SUW.
2016-02-08 22:34:24 +00:00
Tony Mantler
b42b9045e2
Merge "Fix security level display" into nyc-dev
2016-02-08 22:05:08 +00:00
Tony Mantler
3cf07c849b
Fix security level display
...
b/26979319
Change-Id: I049a7f8f7c7917fdc2739234077247116dd8159d
2016-02-08 14:02:05 -08:00
Anna Galusza
2fe55a705b
Merge "Update strings for A11y SUW."
2016-02-08 21:44:32 +00:00
Anna Galusza
0239f95538
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 21:44:13 +00:00
Jim Miller
bbf1cc268c
Fix crash in ConfirmCredentials due to missing fp service. am: 5947d3517d
...
am: d15761a95f
* commit 'd15761a95f93808351a1ae513cc8eb6b9b4234ee':
Fix crash in ConfirmCredentials due to missing fp service.
2016-02-08 20:42:45 +00:00
Jim Miller
d15761a95f
Fix crash in ConfirmCredentials due to missing fp service.
...
am: 5947d3517d
* commit '5947d3517d1cd841ddeb6f756e1953fc8679c9cc':
Fix crash in ConfirmCredentials due to missing fp service.
2016-02-08 20:40:40 +00:00
Jim Miller
5947d3517d
Fix crash in ConfirmCredentials due to missing fp service.
...
Fixes bug 27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit 0918e5d650
)
2016-02-08 20:31:49 +00:00
Jim Miller
0918e5d650
Fix crash in ConfirmCredentials due to missing fp service.
...
Fixes bug 27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
2016-02-08 12:29:25 -08:00
Anna Galusza
d5c26eef64
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 11:46:21 -08:00
Geoff Mendal
6ccf89899d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0f6b093db7
-s ours
...
am: 1319d058e5
-s ours
* commit '1319d058e5f95840136b71881c43251968eb2c99':
Import translations. DO NOT MERGE
2016-02-08 19:19:08 +00:00
Julia Reynolds
1879dd1a5a
Update DND visual interruption choices.
...
am: 9bfad94ea3
* commit '9bfad94ea370f8b8048c13d16117bc8c01a394c2':
Update DND visual interruption choices.
2016-02-08 19:18:56 +00:00
Geoff Mendal
1319d058e5
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 0f6b093db7
-s ours
* commit '0f6b093db74fc4b1b914b1d7b301f9e841184ffe':
Import translations. DO NOT MERGE
2016-02-08 19:02:24 +00:00
Anna Galusza
62f75238e5
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)."
2016-02-08 17:46:43 +00:00
Geoff Mendal
0f6b093db7
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-08 16:57:24 +00:00
Geoff Mendal
582bc62a3d
Import translations. DO NOT MERGE
...
Change-Id: I25c554e30994fb003e43d31e54166ee29e8d5bf6
Auto-generated-cl: translation import
2016-02-08 17:55:50 +01:00