PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,277 Commits 1 Branch 0 Tags
c77839e0e12aaa656a65d5c3ff6da33cb0a76d46
Commit Graph

9024 Commits

Author SHA1 Message Date
Jorim Jaggi
c77839e0e1 am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev 
* commit 'aee6e41e5188e8809d8439f05fdce311aa7171c8':
  Finish trampoline activity for ConfirmDeviceCredential immediately
 2015-09-11 22:33:37 +00:00
Jorim Jaggi
aee6e41e51 Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev 2015-09-11 22:13:21 +00:00
Jorim Jaggi
74a2283d24 Finish trampoline activity for ConfirmDeviceCredential immediately 
Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.

Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
 2015-09-10 20:14:06 -07:00
Jorim Jaggi
5628251b1b am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev 
* commit '5c49b5a4b2cb1d90a02ce8610340db7020715de7':
  Fix crash in when restoring CredentialCheckResultTracker Fragment
 2015-09-11 02:09:36 +00:00
Jorim Jaggi
5c49b5a4b2 Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev 2015-09-11 01:58:55 +00:00
Jason Monk
72fecf9f0a am d3c60afe: Include the usb data mode regardless of data role 
* commit 'd3c60afe5267eb614b9c0a99b797e6bbb51de16f':
  Include the usb data mode regardless of data role
 2015-09-10 20:35:52 +00:00
Jorim Jaggi
69671dafc8 Fix crash in when restoring CredentialCheckResultTracker Fragment 
Bug: 23956504
Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
 2015-09-10 13:35:04 -07:00
Jason Monk
d3c60afe52 Include the usb data mode regardless of data role 
Turns out there are valid data modes in host mode (like midi).
Need to allow these through for the dialog to set the proper
current state.

Bug: 23905770
Change-Id: I7a37ad95ccaf18f211d2b2d330c7f1d7af4cfc16
 2015-09-10 10:38:14 -04:00
Jorim Jaggi
ef5f9e3952 am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit '48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
  Add double-tap power button to open camera 2/2
 2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3 Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jim Miller
01f44efab0 am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro 
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:02:34 +00:00
Jim Miller
179fa5078b Merge "Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again." into mnc-dr-dev 2015-09-09 22:53:53 +00:00
Jorim Jaggi
cc1e9f7ce7 Add double-tap power button to open camera 2/2 
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
 2015-09-09 22:40:00 +00:00
Jim Miller
457904634c Handle fp enrollment errors more gracefully 
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.

Fixes bug 23546104
Fixes bug 22708384

Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
 2015-09-09 15:30:40 -07:00
Sungmin Choi
9819dcb93e am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 17:58:29 +00:00
Sungmin Choi
9fcc7e1b20 Hide or show APNs with type="ims" as CarrierConfig 
APN with type="ims" is used to attach IMS APN to the modem.
This APN is meaningless and confusing to end users.
Most carriers don't care to show this APN from apn list.
Some carriers want to show this APN from apn list and others don't.
This change hides or shows this as CarrierConfig from the APN list.

Bug: 23770219
Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
 2015-09-08 17:23:14 -07:00
Jorim Jaggi
5cca5a5a2c am b83cbe20: Fix build 
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
  Fix build
 2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b Fix build 
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
 2015-09-08 21:42:17 +00:00
Jorim Jaggi
64ea62a30a am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:17:06 +00:00
Jorim Jaggi
8c543276f1 Fix crash in fingerprint settings when rotating 
Fragments always need empty constructors.

Bug: 23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
 2015-09-08 20:43:16 +00:00
Jason Monk
07b26bb3fc am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '1cfaf01fdaba22884a126a84748cf3a619785b3e':
  Start tether service with redeliver intent
 2015-09-03 18:14:51 +00:00
Jason Monk
1cfaf01fda Merge "Start tether service with redeliver intent" into mnc-dr-dev 2015-09-03 17:51:09 +00:00
Jason Monk
09ea9724fa Start tether service with redeliver intent 
So that the intent comes back when we are restarted rather than
null causing a crash.

Bug: 23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
 2015-09-03 12:50:01 -04:00
Jorim Jaggi
98d91550b6 am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit 'c624a72be19027a0784fb41575129b334ff02ae7':
  Fix fingerprint settings ripples
 2015-09-03 01:28:51 +00:00
Jorim Jaggi
c624a72be1 Merge "Fix fingerprint settings ripples" into mnc-dr-dev 2015-09-03 01:19:28 +00:00
Jorim Jaggi
1e2433693a Fix fingerprint settings ripples 
Bug: 22471044
Bug: 23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
 2015-09-02 17:42:29 -07:00
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
 2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog 
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
 2015-09-02 14:36:19 -07:00
Sungmin Choi
e31208ae1c am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit '05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
  To hide none security option, use config_hide_none_security_option config
 2015-09-02 21:02:58 +00:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config 
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.

Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
 2015-09-02 13:51:44 -07:00
Xiyuan Xia
676a4b65b1 am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit '50e1f59a6891cbf3995db0e7fc811f018f9ba63a':
  Fix races in ConfirmPassword/Pattern
 2015-09-01 20:39:58 +00:00
Xiyuan Xia
50e1f59a68 Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 2015-09-01 20:29:41 +00:00
Jason Monk
b39ceab718 am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit '65b0666d36896c0c5616f867af5396c036ed1cb6':
  Protect against multiple provision responses
 2015-09-01 19:10:12 +00:00
Jason Monk
65b0666d36 Merge "Protect against multiple provision responses" into mnc-dr-dev 2015-09-01 19:02:44 +00:00
Xiyuan Xia
9e06cbf5a3 am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit 'a104c05da9d42375f7307cce58039f7edafaa078':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 18:54:08 +00:00
Xiyuan Xia
a104c05da9 Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 2015-09-01 18:46:19 +00:00
Xiyuan Xia
e47a2ab83e Fix wrong stage exception in ChooseLockPattern 
ChooseLockPattern should updateStage instead of always enabling
pattern view input.

Bug:22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
 2015-09-01 11:29:36 -07:00
Jason Monk
359170f4b0 Protect against multiple provision responses 
Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
 2015-09-01 13:20:55 -04:00
Xiyuan Xia
00b17fa3c3 Fix races in ConfirmPassword/Pattern 
- Add a CheckLockResultTracker to track result of async lock check so that
  it can finish on configuration change;
- Let the pending lock check finish and ignore subsequent check requests;
- Add a mDisappearing flag to prevent running disappear animation
  multiple times;
- Check whether activity is still active after disappear animation
  before setting result and finishing it;
- Remove no longer used mNumWrongConfirmAttempts;

Bug:23190499
Change-Id: If1784d3d1fcc152ac06137b12748b9def5726692
 2015-08-31 15:25:31 -07:00
Maurice Lam
8cea65f99f am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 2015-08-28 22:13:19 +00:00
Maurice Lam
48cf33a94e [Fingerprint] Add skip dialog during SUW 
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.

Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
 2015-08-28 12:39:21 -07:00
Xiyuan Xia
e927bd7014 am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 
* commit '43fe6dba693f8f23ffd69c1ffcd3b5642266be58':
  Fix ChoosePat/Pin/Pwd crash from async task
 2015-08-28 01:52:26 +00:00
Xiyuan Xia
43fe6dba69 Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 2015-08-28 01:46:57 +00:00
Xiyuan Xia
3e7e3d6c59 Fix ChoosePat/Pin/Pwd crash from async task 
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.

Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
 2015-08-27 13:35:55 -07:00
Jim Miller
d7e4cd9b1e am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev 
* commit 'f7fc6429874fd02bc3670bce98b2158d2a78aecd':
  Don't attempt to remove fp templates if none are enrolled
 2015-08-25 23:18:54 +00:00
Jim Miller
f7fc642987 Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev 2015-08-25 23:08:55 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib. 
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
 2015-08-25 11:02:59 -07:00
Wei Liu
0e309b867d Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev 2015-08-25 17:55:31 +00:00