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
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
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
Maurice Lam
25e3081575
Update Setup Wizard redaction interstitial styles
...
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
2015-06-04 17:17:07 -07:00
Ye Wen
0bc79df5ef
am 6d3e900c: am 1cb267ae: Enhance change default SMS app dialog to show list of apps
...
* commit '6d3e900c3dce4c6277505edb07c0a66f7a1d6bee':
Enhance change default SMS app dialog to show list of apps
2015-06-04 23:08:50 +00:00
Ye Wen
1cb267ae67
Enhance change default SMS app dialog to show list of apps
...
Settings shows a dialog to android.provider.Telephony.ACTION_CHANGE_DEFAULT
intent to confirm if user wants to change default SMS app to a new one.
This is used by SMS apps to obtain default status. In the opposite direction,
i.e. giving up default status, SMS apps have to bring up the wireless
settings page where the default SMS app setting was originally located.
MNC moved this setting to a different location therefore broke the
function. This change enhances the SmsDefaultDialog to display a list of
SMS apps so that user can choose a different default SMS app, when the
new default SMS app package name is not specified within the above
intent.
b/20430567
Change-Id: I75d518900a7cf17f51b0d466bc2d062c470790bb
2015-06-04 15:16:56 -07:00
ztenghui
4d1bec4730
Setup the animation callback for AnimatedVectorDrawable
...
b/21341096
Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4
2015-06-04 12:55:23 -07:00
Jason Monk
2d499533b7
Fix some dark theme issues (Take 2)
...
Now with visible lock patterns! Both light and dark!
Bug: 21117509
Bug: 21077345
Bug: 21480587
Bug: 21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
2015-06-04 14:16:10 -04:00
John Spurlock
dec8f8107c
am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
Settings: Add zen rule name warning text.
2015-06-04 16:04:13 +00:00
Jason Monk
34bdee377c
am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
...
* commit '06840b31f65e4972c24b7716b29831904d9ee694':
Fix updates of the enable/disable button
2015-06-04 15:44:35 +00:00
John Spurlock
1a1181edde
Merge "Settings: Add zen rule name warning text." into mnc-dev
2015-06-04 15:41:58 +00:00
John Spurlock
7b4d1e2cb8
Settings: Add zen rule name warning text.
...
Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
2015-06-04 11:37:36 -04:00
Jason Monk
cd5b97dfad
Merge "Fix updates of the enable/disable button" into mnc-dev
2015-06-04 15:24:28 +00:00
Jason Monk
74e687b8d1
am 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
...
* commit '3cce5d3798f6140b40ac645d4bd8b66b3f960078':
Fix crash in battery screen
2015-06-04 15:21:04 +00:00
John Spurlock
cc8a3ee2fe
am c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
...
* commit 'c72cfc8a97562999f9ed8292cedfd7132691cb1c':
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
2015-06-04 15:08:27 +00:00
Jason Monk
bdf3ddadd5
Merge "Fix crash in battery screen" into mnc-dev
2015-06-04 14:58:57 +00:00
Jason Monk
63fbf68a42
Fix updates of the enable/disable button
...
Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.
ApplicationsState could use some refactoring.
Bug: 21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4
2015-06-04 10:57:31 -04:00
Jason Monk
6880ec09cd
Fix crash in battery screen
...
Also add a fake app item
Bug: 21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400
2015-06-04 10:52:01 -04:00
John Spurlock
34a78be584
Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
2015-06-04 14:48:02 +00:00
John Spurlock
c5bab237f5
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
...
Bug: 21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76
2015-06-04 10:44:45 -04:00
Jason Monk
2a3aeec398
am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev
...
* commit '2ee08cd9623403948e8d88345426372f213e135d':
Protect against monkey crash
2015-06-04 13:19:49 +00:00