Anna Galusza
b44480912f
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev am: 335a958b57
...
am: bfdee58b89
2016-02-10 18:14:19 +00:00
Jason Monk
22c9ed48d9
Merge "Fix activity weirdness by doing the right thing" into nyc-dev am: db26d19302
...
am: 24f6a0eebc
2016-02-10 18:14:08 +00:00
Udam Saini
b246c6141d
Merge "Reworks lock screen flows." into nyc-dev am: 779fdcca29
...
am: ab242afe1e
2016-02-10 18:13:58 +00:00
Anna Galusza
bfdee58b89
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
...
am: 335a958b57
2016-02-10 18:07:06 +00:00
Jason Monk
24f6a0eebc
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
...
am: db26d19302
2016-02-10 18:06:56 +00:00
Udam Saini
ab242afe1e
Merge "Reworks lock screen flows." into nyc-dev
...
am: 779fdcca29
2016-02-10 18:06:47 +00:00
Anna Galusza
335a958b57
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
2016-02-10 17:59:08 +00:00
Jason Monk
db26d19302
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
2016-02-10 17:57:28 +00:00
Jason Monk
30e9fc870f
Fix activity weirdness by doing the right thing
...
Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
2016-02-10 12:55:37 -05:00
Udam Saini
779fdcca29
Merge "Reworks lock screen flows." into nyc-dev
2016-02-10 17:54:58 +00:00
Geoff Mendal
30b464daaf
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 51d56dc14e -s ours
...
am: 94e5168daf
2016-02-10 16:48:47 +00:00
Geoff Mendal
94e5168daf
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 51d56dc14e
2016-02-10 16:46:05 +00:00
Geoff Mendal
51d56dc14e
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-10 16:43:32 +00:00
Geoff Mendal
f87d8c85c4
Import translations. DO NOT MERGE am: a27cd9d033 -s ours am: 029c196bf6 -s ours
...
am: 963ed1b38d
2016-02-10 15:50:08 +00:00
Geoff Mendal
e42e2fe251
Import translations. DO NOT MERGE
...
Change-Id: I0cab1d68ca64567f0755574a37c2f1e52c45abca
Auto-generated-cl: translation import
2016-02-10 07:48:36 -08:00
Geoff Mendal
963ed1b38d
Import translations. DO NOT MERGE am: a27cd9d033 -s ours
...
am: 029c196bf6
2016-02-10 15:47:06 +00:00
Geoff Mendal
029c196bf6
Import translations. DO NOT MERGE
...
am: a27cd9d033
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
2016-02-10 09:09:57 +00:00
Andre Eisenbach
8c32a90e9c
Add Developer menu entry to disable Bluetooth absolute volume am: 591c6c4f5a
...
am: 42aeccb95e
2016-02-10 09:09:47 +00:00
Jeremy Klein
99888fe540
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
...
am: d119f50314
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
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
2016-02-10 00:08:51 +00:00
Jim Miller
ff6f9c1b92
Fix crash in Settings on devices without fingerprint. am: 017bdceeb4
...
am: 6f5c588e5b
2016-02-09 23:59:42 +00:00
Andre Eisenbach
37561b0e3c
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
...
am: 6979c8bbe3
2016-02-09 23:55:04 +00:00
Jim Miller
6f5c588e5b
Fix crash in Settings on devices without fingerprint.
...
am: 017bdceeb4
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
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
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
8ef4c62003
Reworks lock screen flows.
...
This also adds frp warning dialogs in case the user skips lock
screen setup initially.
bug:26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c
2016-02-09 11:58:12 -08:00
Udam Saini
d36f4e2be2
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
...
am: 40f4bf2a1f
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
2016-02-09 18:29:47 +00:00
Samuel Tan
aedb058e1b
Allow trusted system certificates to be used in EAP network configs
...
am: 2b16cd3920
2016-02-09 18:24:20 +00:00
Anna Galusza
132e0784eb
Change style of Preview screens (dark borders with "preview" on the bottom).
...
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
(cherry picked from commit 206a845710
2016-02-09 08:48:14 -08: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
2016-02-08 23:28:40 +00:00
Tony Mantler
e6bf755125
Merge "Fix security level display" into nyc-dev am: b42b9045e2
...
am: 2eef414b1d
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
2016-02-08 22:41:26 +00:00
Tony Mantler
2eef414b1d
Merge "Fix security level display" into nyc-dev
...
am: b42b9045e2
2016-02-08 22:34:50 +00:00
