Commit Graph

25516 Commits

Author SHA1 Message Date
Mihai Nita
7b1ce1e7e0 UX fixes for the language draggable cell am: 7f78a4b723
am: dc7d254f76

* commit 'dc7d254f766bd65bac540961063978ac8acf3697':
  UX fixes for the language draggable cell
2016-02-10 21:54:23 +00:00
Mihai Nita
dc7d254f76 UX fixes for the language draggable cell
am: 7f78a4b723

* commit '7f78a4b7230a17cbf356899f3a31fdbac360bc96':
  UX fixes for the language draggable cell
2016-02-10 21:50:50 +00:00
Udam Saini
b6efc89a02 Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev am: 4b796fa7d8
am: 3e64c83eef

* commit '3e64c83eef2fbcf0e0edd51edea2e3447bdec7f5':
  Fixes showing learn more screen from fingerprint intro page
2016-02-10 21:47:08 +00:00
mariagpuyol
10fa9e15c0 Modify emergency info subtitle am: 1c9b3d5b5f
am: 262e6f8519

* commit '262e6f851993c2448f2cbbdf31cf01c525d7f26d':
  Modify emergency info subtitle
2016-02-10 21:46:59 +00:00
Mihai Nita
7f78a4b723 UX fixes for the language draggable cell
This should bring things closer to the recommended UX guidelines.

It changes the way the checkbox / label play together,
and changes the "localization missing" warning icon to a string.
Also some cleanup of hard-coded styles and sizes.

Bug: 26758865
Bug: 26707846
Change-Id: I07a78a1e4a41122b91e895e363a217d3e9cacd40
2016-02-10 21:46:13 +00:00
Udam Saini
3e64c83eef Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
am: 4b796fa7d8

* commit '4b796fa7d843bcb4886a153962ab3fdb3716f61e':
  Fixes showing learn more screen from fingerprint intro page
2016-02-10 21:43:07 +00:00
mariagpuyol
262e6f8519 Modify emergency info subtitle
am: 1c9b3d5b5f

* commit '1c9b3d5b5f2122fbceee1942f61e0fc6694e2ba1':
  Modify emergency info subtitle
2016-02-10 21:42:58 +00:00
Udam Saini
4b796fa7d8 Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev 2016-02-10 21:36:55 +00:00
Sudheer Shanka
28eab080ca Disable clear credential option when disallowed by admin.
Bug: 27119114
Change-Id: I0f60880b125149cd1a9aa5f4e9a5340f49042367
2016-02-10 21:35:54 +00:00
mariagpuyol
1c9b3d5b5f Modify emergency info subtitle
Change-Id: Iaa2ba23a1c0a74552e0f9b71d1e45711126a711c
2016-02-10 13:24:38 -08:00
Udam Saini
f21335c6f0 Fixes showing learn more screen from fingerprint intro page
bug:27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f
2016-02-10 12:04:50 -08:00
Anna Galusza
b44480912f Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev am: 335a958b57
am: bfdee58b89

* commit 'bfdee58b8967c0adb2509d497a9c1c32b874e265':
  Change style of Preview screens (dark borders with "preview" on the bottom).
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

* commit '24f6a0eebcd11652e4ed80b1b56a9754f5d9db60':
  Fix activity weirdness by doing the right thing
2016-02-10 18:14:08 +00:00
Udam Saini
b246c6141d Merge "Reworks lock screen flows." into nyc-dev am: 779fdcca29
am: ab242afe1e

* commit 'ab242afe1eabac113c1e4fcd89fc98a637d89d0f':
  Reworks lock screen flows.
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

* commit '335a958b57045c90baad25f186a0a27f16dfa9bc':
  Change style of Preview screens (dark borders with "preview" on the bottom).
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

* commit 'db26d19302ea7b0bd169907809b58044e7fbff10':
  Fix activity weirdness by doing the right thing
2016-02-10 18:06:56 +00:00
Udam Saini
ab242afe1e Merge "Reworks lock screen flows." into nyc-dev
am: 779fdcca29

* commit '779fdcca29d1c87fd5dba7fd7198db182c39620c':
  Reworks lock screen flows.
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  -s ours

* commit '94e5168dafa615833f489217157f574d485d5c33':
  Import translations. DO NOT MERGE
2016-02-10 16:48:47 +00:00
Geoff Mendal
94e5168daf Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 51d56dc14e  -s ours

* commit '51d56dc14ea77334c4897f884151fac83cdcb632':
  Import translations. DO NOT MERGE
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  -s ours

* commit '963ed1b38d832b37784f48f733b2503ad676620e':
  Import translations. DO NOT MERGE
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  -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
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

* commit '40f4bf2a1fc9e4c60f44661647f091f6c0e91cb3':
  Adds the headers for choose lock generic inside onCreate
2016-02-09 18:50:39 +00:00