Andrei Kapishnikov
6503765462
Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
2015-04-29 14:13:40 +00:00
Geoff Mendal
623cd8c293
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-04-29 14:07:34 +00:00
John Spurlock
0423aed775
Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev
2015-04-29 14:02:55 +00:00
Geoff Mendal
185c8fd6da
Import translations. DO NOT MERGE
...
Change-Id: Ibbdc2e71ca955cc4cfc648b2f54d592cf5285725
Auto-generated-cl: translation import
2015-04-29 09:01:14 -05:00
Geoff Mendal
3141270a1e
Import translations. DO NOT MERGE
...
Change-Id: If39a43ecd48ea382144660b0c47e864b014b239e
Auto-generated-cl: translation import
2015-04-29 08:11:54 -05:00
Martijn Coenen
a570479c71
am 3ef56acd
: am a0ee97f1
: am 01d13c04
: Merge "New Tap & Pay UX." into mnc-dev
...
* commit '3ef56acd622778f8f8582bb2fc0c27fcd6973809':
New Tap & Pay UX.
2015-04-29 08:04:15 +00:00
Martijn Coenen
3ef56acd62
am a0ee97f1
: am 01d13c04
: Merge "New Tap & Pay UX." into mnc-dev
...
* commit 'a0ee97f1962cb96ec3e3fc865c6174d5fad2556c':
New Tap & Pay UX.
2015-04-29 07:53:17 +00:00
Martijn Coenen
a0ee97f196
am 01d13c04
: Merge "New Tap & Pay UX." into mnc-dev
...
* commit '01d13c043a7d9f2aef357e17f2d6a36c678006e6':
New Tap & Pay UX.
2015-04-29 07:41:50 +00:00
Martijn Coenen
01d13c043a
Merge "New Tap & Pay UX." into mnc-dev
2015-04-29 07:29:32 +00:00
Jeff Sharkey
033e3af21b
am 9fd5ce62
: am 6e86616d
: am a16257db
: Format as public/private; follow refactoring.
...
* commit '9fd5ce625a1c85db2269030382da06fe056180a8':
Format as public/private; follow refactoring.
2015-04-29 05:52:56 +00:00
Jeff Sharkey
9fd5ce625a
am 6e86616d
: am a16257db
: Format as public/private; follow refactoring.
...
* commit '6e86616df7d92a1a628d773c37f6d134d1e7edac':
Format as public/private; follow refactoring.
2015-04-29 05:41:35 +00:00
Jeff Sharkey
6e86616df7
am a16257db
: Format as public/private; follow refactoring.
...
* commit 'a16257dbd5599135320f4263a2cb438b7a469084':
Format as public/private; follow refactoring.
2015-04-29 05:29:52 +00:00
Jeff Sharkey
a16257dbd5
Format as public/private; follow refactoring.
...
Offer to format an empty disk as public/private.
Bug: 19993667
Change-Id: I69fafaed524f3ef5e65d04a9e3a94789fcfc3087
2015-04-28 21:54:54 -07:00
Andrei Kapishnikov
146fc11958
Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
...
When DO_NOT_ASK_CREDENTIALS_ON_BOOT flag is set in
DevicePolicyManager, the Settings UI:
1) Should not encrypt the device with password when the
user encrypts the device for the first time. The default
encryption type should be used instead.
2) Should not give the choice to the user whether to
encrypt the device with password/PIN or not but always
encrypt the device without password.
Related CL: https://googleplex-android-review.git.corp.google.com/#/c/665371/
Change-Id: Ic09f02c033a0b16b7ffc45bf6d675b62d1be4bd8
2015-04-29 02:53:53 +00:00
Fabrice Di Meglio
8bde3c899e
am d908e2b6
: am a7d30e64
: am 02c89944
: Merge "Add user selectable Default Browser feature - part 2" into mnc-dev
...
* commit 'd908e2b64d65071fed774ea401e2110c9866025b':
Add user selectable Default Browser feature - part 2
2015-04-29 02:26:09 +00:00
Adrian Roos
e56b1b9230
am b4628281
: am ccbe03cb
: am fb4c4de8
: Merge "Require explicit userId in LockPatternUtils" into mnc-dev
...
* commit 'b462828178f604ec5d2c9f6d2847be04cc9cee79':
Require explicit userId in LockPatternUtils
2015-04-29 02:26:07 +00:00
Elliott Hughes
8c417711f4
am 0dd8dbf5
: am 90f9bed6
: am 28077b9c
: Add Pacific/Noumea.
...
* commit '0dd8dbf59b7dfe0ec3e2fe42d5cb3d9f78f1cf1c':
Add Pacific/Noumea.
2015-04-29 02:26:06 +00:00
Jorim Jaggi
5679c4b834
am 25bafe11
: am 8f476cda
: am 441ea80d
: Add animation for fingerprint icon
...
* commit '25bafe117832997a66c472f6e975f8359ea389d7':
Add animation for fingerprint icon
2015-04-29 02:26:04 +00:00
Yorke Lee
b9b0fe8a91
am 83cdcf10
: am 8dbd3e74
: am 0b31dc54
: Merge "Simplify DefaultDialerManager" into mnc-dev
...
* commit '83cdcf10529cd7faa74755854851434f3e071ae0':
Simplify DefaultDialerManager
2015-04-29 02:26:01 +00:00
Fabrice Di Meglio
d908e2b64d
am a7d30e64
: am 02c89944
: Merge "Add user selectable Default Browser feature - part 2" into mnc-dev
...
* commit 'a7d30e64f7b11db70884635b3965aa52e54c2e36':
Add user selectable Default Browser feature - part 2
2015-04-29 02:01:26 +00:00
Adrian Roos
b462828178
am ccbe03cb
: am fb4c4de8
: Merge "Require explicit userId in LockPatternUtils" into mnc-dev
...
* commit 'ccbe03cb82f36661b7578a6b9b276dd65db75332':
Require explicit userId in LockPatternUtils
2015-04-29 02:01:24 +00:00
Elliott Hughes
0dd8dbf59b
am 90f9bed6
: am 28077b9c
: Add Pacific/Noumea.
...
* commit '90f9bed6d434996b87fafba92f37641d516d38eb':
Add Pacific/Noumea.
2015-04-29 02:01:23 +00:00
Jorim Jaggi
25bafe1178
am 8f476cda
: am 441ea80d
: Add animation for fingerprint icon
...
* commit '8f476cdace0c72681d226f0a21767225a329a04b':
Add animation for fingerprint icon
2015-04-29 02:01:22 +00:00
Yorke Lee
83cdcf1052
am 8dbd3e74
: am 0b31dc54
: Merge "Simplify DefaultDialerManager" into mnc-dev
...
* commit '8dbd3e74c374b9c7231ca1fcba27a9bff9f47a33':
Simplify DefaultDialerManager
2015-04-29 02:01:20 +00:00
Fabrice Di Meglio
a7d30e64f7
am 02c89944
: Merge "Add user selectable Default Browser feature - part 2" into mnc-dev
...
* commit '02c89944d13fa473c9fb0da3c5a69777a25fe048':
Add user selectable Default Browser feature - part 2
2015-04-29 01:45:06 +00:00
Adrian Roos
ccbe03cb82
am fb4c4de8
: Merge "Require explicit userId in LockPatternUtils" into mnc-dev
...
* commit 'fb4c4de81d72faa13bd4f0629b0272d2668d884b':
Require explicit userId in LockPatternUtils
2015-04-29 01:43:10 +00:00
Elliott Hughes
90f9bed6d4
am 28077b9c
: Add Pacific/Noumea.
...
* commit '28077b9cc86388f9b5dfa29a79a5a42c3d545d29':
Add Pacific/Noumea.
2015-04-29 01:43:09 +00:00
Jorim Jaggi
8f476cdace
am 441ea80d
: Add animation for fingerprint icon
...
* commit '441ea80d0ac874955ca7a83ddb8d140ccf87f7ab':
Add animation for fingerprint icon
2015-04-29 01:41:14 +00:00
Yorke Lee
8dbd3e74c3
am 0b31dc54
: Merge "Simplify DefaultDialerManager" into mnc-dev
...
* commit '0b31dc54bf4af2b11f46446f3a5c8d8d1d537242':
Simplify DefaultDialerManager
2015-04-29 01:41:05 +00:00
Maurice Lam
c36b61ea44
[WifiSetup] Use default theme for Wi-Fi dialogs
...
Just use the default theme as the dialog doesn't require any
additional attributes to be specified. (Theme.Settings is setting
alertDialogTheme to Theme.AlertDialog as well).
This will allow the correct accent colors (among other theme
attributes) to be propagated to the dialog.
Bug: 20663720
Change-Id: Ibb12c185e8104ccb8f3ddd01524127c748b47487
2015-04-28 18:33:50 -07:00
Vinit Deshpande
6eed840977
Merge "Implement 'Available via Passpoint' feature"
2015-04-29 00:51:33 +00:00
Fabrice Di Meglio
02c89944d1
Merge "Add user selectable Default Browser feature - part 2" into mnc-dev
2015-04-29 00:44:12 +00:00
Fabrice Di Meglio
afa7afda4f
Add user selectable Default Browser feature - part 2
...
- show full list of Browsers
This change depends on a Framework change which adds a new MATCH_ALL
constant flag in PackageManager for getting the full list.
See bug #20144393
Change-Id: I6ed29cbac28aaf1a955541db0615a1d20d267fd5
2015-04-28 16:58:05 -07:00
Adrian Roos
fb4c4de81d
Merge "Require explicit userId in LockPatternUtils" into mnc-dev
2015-04-28 22:09:44 +00:00
Elliott Hughes
7e1bbeee65
am fae9ca8c
: am a9657f55
: Merge "Add Pacific/Noumea."
...
* commit 'fae9ca8cd505df1b97679f7bafd0621eb9ccf2ec':
Add Pacific/Noumea.
2015-04-28 21:53:31 +00:00
Elliott Hughes
fae9ca8cd5
am a9657f55
: Merge "Add Pacific/Noumea."
...
* commit 'a9657f553d2db21f99f1129cb18490d7e2497b31':
Add Pacific/Noumea.
2015-04-28 21:33:52 +00:00
Elliott Hughes
28077b9cc8
Add Pacific/Noumea.
...
Also move Majuro to the right place in the list. It's +11, not -11.
(cherry-pick of 23ae8827c1bd86ec632eab42d067148f8b3452e8.)
Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
2015-04-28 13:59:54 -07:00
Elliott Hughes
a9657f553d
Merge "Add Pacific/Noumea."
2015-04-28 20:41:53 +00:00
Elliott Hughes
23ae8827c1
Add Pacific/Noumea.
...
Also move Majuro to the right place in the list. It's +11, not -11.
Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
2015-04-28 13:35:25 -07:00
Jorim Jaggi
441ea80d0a
Add animation for fingerprint icon
...
Also show the "Whoops" dialog when the finger is resting on the icon,
in addition to show it after clicking it for 3 times.
Bug: 20495507
Change-Id: I771da0671f61c13065b011d613f508827cb3b54f
(cherry picked from commit 2c2a41669f
)
2015-04-28 19:20:59 +00:00
Jorim Jaggi
d2931b321c
Merge "Add animation for fingerprint icon"
2015-04-28 19:20:50 +00:00
Adrian Roos
5437588abd
Require explicit userId in LockPatternUtils
...
Bug: 18931518
Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
2015-04-28 12:01:09 -07:00
Yorke Lee
0b31dc54bf
Merge "Simplify DefaultDialerManager" into mnc-dev
2015-04-28 18:58:01 +00:00
Yorke Lee
ec996be27b
Simplify DefaultDialerManager
...
The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.
Bug: 20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
2015-04-28 11:35:22 -07:00
Sanket Padawe
ab489de784
DO NOT MERGE - Disable data sim selection when phone call is going on.
...
Bug: 19301456
Bug: 19150497
Change-Id: I00109b7648af670eb041b3ef734c67454ce22dc3
2015-04-28 10:38:25 -07:00
John Spurlock
8881120246
Settings: "No interruptions" -> "Total silence"
...
Bug: 20064962
Change-Id: I318fc5cf4555cfbbd019a7f012c02ab8cb322f2c
2015-04-28 15:36:50 +00:00
Sudheer Shanka
d188c68094
am f1fa3c7a
: am 3ad534aa
: am bc956309
: Update warning dialog on work profile deletion.
...
* commit 'f1fa3c7a3daa6642b20d1afda9ce30f996ae8866':
Update warning dialog on work profile deletion.
2015-04-28 15:27:25 +00:00
Geoff Mendal
f4f16f5d60
am 39285862
: (-s ours) am 0baeee0c
: (-s ours) am 79670bbe
: (-s ours) Import translations. DO NOT MERGE
...
* commit '392858626b0b4583a71372a9b05be94927958d2f':
Import translations. DO NOT MERGE
2015-04-28 15:27:23 +00:00
Alan Viverette
9beaa1791b
am d508cd9b
: am fb7827f3
: am d4988442
: Point to Material.Settings themes
...
* commit 'd508cd9b6f7d7e567d1989be4b365bfee0112704':
Point to Material.Settings themes
2015-04-28 15:27:21 +00:00
Yorke Lee
4d8211e69e
am beed867a
: am 80848e20
: am 169f824b
: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
...
* commit 'beed867ada66f98c1867dbf4bdbb13d1bb0c1a81':
Rename setDefaultDialerApplication for consistency
2015-04-28 15:27:19 +00:00