Maurice Lam
afbcbf7634
am 2add7d0d
: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev
...
* commit '2add7d0d0528fd5823471dbe338f4b5b20773efb':
[WifiSetup] Use default theme for Wi-Fi dialogs
2015-04-29 18:25:45 +00:00
Maurice Lam
2add7d0d05
Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev
2015-04-29 18:17:16 +00:00
Jason Monk
d5e533e4bc
am 28c3ba15
: Merge "Allow filtering system apps on most app lists" into mnc-dev
...
* commit '28c3ba156f06e8f021ff6eabababe1a8627ff100':
Allow filtering system apps on most app lists
2015-04-29 17:23:35 +00:00
Jason Monk
28c3ba156f
Merge "Allow filtering system apps on most app lists" into mnc-dev
2015-04-29 17:10:35 +00:00
Jason Monk
fbaf4363f6
Allow filtering system apps on most app lists
...
Change-Id: If852adec4122aca3f11b0f894c0c44d12a75cc77
2015-04-29 13:02:08 -04:00
Andrei Kapishnikov
56adc0db81
am 65037654
: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
...
* commit '65037654623752e2336044390946c59ac8cfa128':
Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
2015-04-29 14:29:20 +00:00
Geoff Mendal
07b4d28755
am 623cd8c2
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '623cd8c293f9ea8974efe5caaca16a250bee0b00':
Import translations. DO NOT MERGE
2015-04-29 14:16:15 +00:00
John Spurlock
1e8a9f5fd3
am 0423aed7
: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev
...
* commit '0423aed775d0b00cbdf6cc1b422ede704830d43a':
Settings: "No interruptions" -> "Total silence"
2015-04-29 14:16:12 +00:00
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
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
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
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
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
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
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
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
John Spurlock
8881120246
Settings: "No interruptions" -> "Total silence"
...
Bug: 20064962
Change-Id: I318fc5cf4555cfbbd019a7f012c02ab8cb322f2c
2015-04-28 15:36:50 +00:00
Sudheer Shanka
3ad534aa84
am bc956309
: Update warning dialog on work profile deletion.
...
* commit 'bc95630994227736aff46885ca1d9345829e83e2':
Update warning dialog on work profile deletion.
2015-04-28 13:51:55 +00:00
Sudheer Shanka
bc95630994
Update warning dialog on work profile deletion.
...
Bug: 20024761
Change-Id: I23b0eaa7742d9d23a29a2a48ab6e3d92fe310560
2015-04-28 11:32:09 +00:00
Geoff Mendal
0baeee0c0d
am 79670bbe
: (-s ours) Import translations. DO NOT MERGE
...
* commit '79670bbe68dbc6c6cc1da9f1d093dabb8099e7f5':
Import translations. DO NOT MERGE
2015-04-28 09:36:13 +00:00
Martijn Coenen
fe58b534f6
New Tap & Pay UX.
...
Change-Id: Icbffe0f58d2c37d5691357c13a14ab9a40e53249
2015-04-28 08:17:22 +00:00
Geoff Mendal
79670bbe68
Import translations. DO NOT MERGE
...
Change-Id: I5f859b65d600018c5dc8cf650e5a7f701609acff
Auto-generated-cl: translation import
2015-04-27 23:16:11 -07:00
Alan Viverette
fb7827f3be
am d4988442
: Point to Material.Settings themes
...
* commit 'd4988442cbdf287e9856c3c00dad662e1ab36d2b':
Point to Material.Settings themes
2015-04-27 23:43:58 +00:00
Alan Viverette
d4988442cb
Point to Material.Settings themes
...
Bug: 20546201
Change-Id: Ib6d480d12261101c2e240b23163195ff006a41bd
2015-04-27 23:20:18 +00:00
Yorke Lee
80848e20fc
am 169f824b
: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
...
* commit '169f824bfe0849de2dc2075e88e54d3248aedda7':
Rename setDefaultDialerApplication for consistency
2015-04-27 23:13:16 +00:00
Yorke Lee
169f824bfe
Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
2015-04-27 22:49:26 +00:00
Yorke Lee
f28c517174
Rename setDefaultDialerApplication for consistency
...
Change-Id: I0749f2cbaaf0e9fd7fb8274a088ca971a33b2a36
2015-04-27 15:18:47 -07:00
Jorim Jaggi
8013426679
am 4a2423ba
: Move fingerprint enroll logic into sidecar fragment
...
* commit '4a2423ba5eeee22d38942ead60bfd3bb13f44655':
Move fingerprint enroll logic into sidecar fragment
2015-04-27 21:57:20 +00:00
Jorim Jaggi
6ecd100583
am 11eae045
: Allow incremental builds for settings.
...
* commit '11eae0450b9770bdef3509a620b8c54beba2bab3':
Allow incremental builds for settings.
2015-04-27 21:57:18 +00:00
Jorim Jaggi
4a2423ba5e
Move fingerprint enroll logic into sidecar fragment
...
So enroll can continue across configuration changes.
Bug: 20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
(cherry picked from commit 64e9c4cb2c
)
2015-04-27 21:16:22 +00:00
Jorim Jaggi
11eae0450b
Allow incremental builds for settings.
...
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523
(cherry picked from commit c9f73801df
)
2015-04-27 21:16:03 +00:00
Maurice Lam
ab82d2fdf9
am 9fab5c1d
: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev
...
* commit '9fab5c1d94485093e7e6d4d6e938d444872bd226':
[LockSetup] Hide back button in notification interstitial
2015-04-27 20:01:59 +00:00
Maurice Lam
9fab5c1d94
Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev
2015-04-27 19:19:51 +00:00
Maurice Lam
752e5f3895
[LockSetup] Hide back button in notification interstitial
...
The back button is disabled because the lock screen is already set
up. Per UX spec, we should hide the back button instead of disabling
it.
Bug: 20427092
Change-Id: Iaaf8860208179dfa5974b172013f9882827c6c4a
2015-04-27 11:54:14 -07:00
Maurice Lam
824b09cb41
am 80ca2687
: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev
...
* commit '80ca2687bb123ccdff299e9e1da87ae6eae354c5':
[WifiSetup] Show progress bar when scanning
2015-04-27 18:07:37 +00:00