Jason Monk
cc0f3b75b2
Merge "Advanced apps updates (2/2)" into mnc-dev
2015-06-10 12:59:33 +00:00
Neil Fuller
c28330ec3e
Merge "Modifications for changes to SettingsLib" into mnc-dev
2015-06-10 12:23:49 +00:00
Fyodor Kupolov
bf25b219ab
am af27f96b
: am 8e2c4787
: Merge "Guest option should not be shown for the guest user" into mnc-dev
...
* commit 'af27f96bc61ed23658696d440919b286ea4d747a':
Guest option should not be shown for the guest user
2015-06-09 23:23:44 +00:00
Fyodor Kupolov
8e2c478701
Merge "Guest option should not be shown for the guest user" into mnc-dev
2015-06-09 22:57:27 +00:00
Fyodor Kupolov
c478885d8d
Guest option should not be shown for the guest user
...
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
2015-06-09 15:55:01 -07:00
Casper Bonde
fa9fcf119b
am b9484071
: am e278a208
: SAP: Make it possible to enforce a 16-digit pin code (5/5)
...
* commit 'b94840712e9257e6f38446c7d7a3c4d3d79cf089':
SAP: Make it possible to enforce a 16-digit pin code (5/5)
2015-06-09 22:09:38 +00:00
Casper Bonde
e278a208bc
SAP: Make it possible to enforce a 16-digit pin code (5/5)
...
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.
This is needed for the SIM access profile.
Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com >
2015-06-09 21:42:15 +00:00
Jason Monk
ba0e2c8688
Advanced apps updates (2/2)
...
Change the title of the screen, add a category to break things up
Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
2015-06-09 16:01:28 -04:00
Chris Wren
ca689aeada
annoint new constants
...
Bug: 21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9
2015-06-09 14:24:03 -04:00
Tony Mantler
d1e9671f57
am 20296c96
: am 8c39a9c6
: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
...
* commit '20296c966023a1fc3ae5b08950fc6a36becd8bf1':
Move ApplicationsState to SettingsLib
2015-06-09 17:46:51 +00:00
Tony Mantler
8c39a9c6f2
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
2015-06-09 17:20:25 +00:00
Chris Wren
49203c0bd2
am 455b27ee
: am c7581e81
: instrument display rotation settings
...
* commit '455b27eee06ff6577453936e531186caca000d56':
instrument display rotation settings
2015-06-09 16:44:16 +00:00
Chris Wren
0daeb1374b
am 5d66e170
: am 18213459
: don\'t double set the dropdown value
...
* commit '5d66e17002053fe759c47cb5aae26f70e677e248':
don't double set the dropdown value
2015-06-09 16:44:15 +00:00
Chris Wren
c7581e8126
instrument display rotation settings
...
Bug: 21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
2015-06-09 12:10:15 -04:00
Chris Wren
182134595b
don't double set the dropdown value
...
idion: set the default value, and then add a callback
actual: spinner posts the change to a handler: so it posts after the callback is set.
This makes it hard to count actual user interactions without counting the initialization.
Bug: 21530764
Change-Id: I3ff8319edb374d8d7c10982512054f303c69a5ec
2015-06-09 12:09:44 -04:00
Jim Miller
0f90a53f39
am 6b176ce8
: am fa47bc02
: Update and cleanup FingerprintManager API to new spec
...
* commit '6b176ce80d95efcd3058d463a26fce870e146466':
Update and cleanup FingerprintManager API to new spec
2015-06-09 13:01:35 +00:00
Neil Fuller
b986442747
Modifications for changes to SettingsLib
...
See associated changes in frameworks/base for details.
Bug: 19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: Ic3393df28dd63ca75b203d1d0430d69cab7c40de
2015-06-09 10:10:56 +01:00
Makoto Onuki
375c3a080e
Show list of permissions instead of just numbers
...
Bug 21615746
Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
2015-06-08 17:48:46 -07:00
Jim Miller
fa47bc0290
Update and cleanup FingerprintManager API to new spec
...
Fixes bug 21040383
Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
2015-06-08 17:17:44 -07:00
Tony Mantler
67cd6ab93a
Move ApplicationsState to SettingsLib
...
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings
b/21328967
Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
2015-06-08 14:41:02 -07:00
John Spurlock
541e5c410c
am 1b76e790
: am 9a583610
: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
...
* commit '1b76e7904744a4cde25af73ff9b378d3a765c640':
Settings: Update notification listener user prompt strings.
2015-06-08 21:28:59 +00:00
John Spurlock
9a58361076
Merge "Settings: Update notification listener user prompt strings." into mnc-dev
2015-06-08 21:04:19 +00:00
John Spurlock
90e27a4893
Settings: Update notification listener user prompt strings.
...
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
2015-06-08 16:50:36 -04:00
Alex Klyubin
ae86002ad9
am ddd4d074
: am abe74683
: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
...
* commit 'ddd4d074380d51d3ca5c83cd1067efa95a2855e3':
Switch from KeyStore.saw to KeyStore.list.
2015-06-08 18:38:14 +00:00
Alex Klyubin
abe74683c1
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
2015-06-08 18:11:23 +00:00
John Spurlock
2268450147
am 7db10639
: am 178d46a9
: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
...
* commit '7db1063958b8192237dec6ffa2de2092ccd0f486':
Settings: Update DND access dialog to new user flow.
2015-06-08 17:04:17 +00:00
Martijn Coenen
a048b2c76a
am 4504eb36
: am 1276b213
: Merge "Add NFC payment "how it works" screens." into mnc-dev
...
* commit '4504eb36be7932bbd3fe1c9e0759ef7231dbb70d':
Add NFC payment "how it works" screens.
2015-06-08 17:04:15 +00:00
Martijn Coenen
73f95c4389
am dcf324c0
: am 63f7fc88
: Merge "NFC: don\'t use dynamic resources." into mnc-dev
...
* commit 'dcf324c0b3917c8d9007a58bc35591c75793c422':
NFC: don't use dynamic resources.
2015-06-08 17:04:14 +00:00
John Spurlock
178d46a9b5
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
2015-06-08 16:39:33 +00:00
Alex Klyubin
3848407d0c
Switch from KeyStore.saw to KeyStore.list.
...
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.
Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
2015-06-08 09:30:08 -07:00
John Spurlock
a00194d998
Settings: Update DND access dialog to new user flow.
...
- Only list apps in the DND access list that have included
the corresponding permission in their manifest.
- Show a scary user warning before enabling access per app.
- Update manifest to follow framework intent action rename.
Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
2015-06-08 12:27:03 -04:00
Martijn Coenen
1276b21317
Merge "Add NFC payment "how it works" screens." into mnc-dev
2015-06-08 08:02:30 +00:00
Martijn Coenen
63f7fc8847
Merge "NFC: don't use dynamic resources." into mnc-dev
2015-06-08 08:01:48 +00:00
Sanket Padawe
7e7376bf75
am ca324f5a
: am 547089c3
: Merge "Fix wifi network strings shown in Settings." into mnc-dev
...
* commit 'ca324f5abf12bab607c74c5aaa0c5e256c5dcefc':
Fix wifi network strings shown in Settings.
2015-06-06 02:21:16 +00:00
Sanket Padawe
547089c376
Merge "Fix wifi network strings shown in Settings." into mnc-dev
2015-06-06 01:58:20 +00:00
Sanket Padawe
2816e4e3e0
Fix wifi network strings shown in Settings.
...
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
2015-06-05 18:49:12 -07:00
Ruben Brunk
2585210c8d
am bf493816
: am e35df2ff
: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
...
* commit 'bf4938166fc539d348dfb8167b03637fecf4d6c0':
Add UI for camera + flashlight battery reporting.
2015-06-06 00:29:46 +00:00
Ruben Brunk
e35df2ff3b
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac
Add UI for camera + flashlight battery reporting.
...
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
2015-06-05 16:05:18 -07:00
Martijn Coenen
cbcc76e8d3
Add NFC payment "how it works" screens.
...
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
2015-06-05 21:35:55 +02:00
Maurice Lam
32d1728aa3
am e8f39de6
: am 26a42d10
: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
...
* commit 'e8f39de661a4a22ced8c72677f53f5420792736e':
Update Setup Wizard redaction interstitial styles
2015-06-05 19:34:20 +00:00
Maurice Lam
26a42d1099
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
2015-06-05 19:13:18 +00:00
Jorim Jaggi
3975dbc5e8
am 685a359c
: am 5ae7cf3a
: Merge "Fix lockpattern weirdness" into mnc-dev
...
* commit '685a359ca1b3a20fcdc8dae92a5a050c2a7ea3bd':
Fix lockpattern weirdness
2015-06-05 18:39:14 +00:00
Jorim Jaggi
5ae7cf3a14
Merge "Fix lockpattern weirdness" into mnc-dev
2015-06-05 18:12:17 +00:00
ztenghui
99b66dc776
am b1651d0e
: am 167a6bcd
: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
...
* commit 'b1651d0e1f3d99bca8cec07f53258b05d169e618':
Setup the animation callback for AnimatedVectorDrawable
2015-06-05 17:02:40 +00:00
ztenghui
167a6bcdb7
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
2015-06-05 16:37:05 +00:00
Jason Monk
28efc11e2b
am f5a7d673
: am d7dbe161
: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit 'f5a7d673fa1f5707f277e426f9c1e3ef33acee6e':
Fix some dark theme issues (Take 2)
2015-06-05 13:43:35 +00:00
Jason Monk
d7dbe16142
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
2015-06-05 13:23:13 +00:00
Martijn Coenen
6d5cac5946
NFC: don't use dynamic resources.
...
Also fixed talk-back for the default
payment app selection.
Bug: 21343778
Bug: 21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
2015-06-05 11:36:50 +02:00
Jorim Jaggi
58c5fb38c7
Fix lockpattern weirdness
...
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.
Bug: 21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0
2015-06-04 18:00:34 -07:00