PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,914 Commits 1 Branch 0 Tags
a2a134f79aa55b7647c75a7436e8f17de6e39b5b
Commit Graph

10536 Commits

Author SHA1 Message Date
Jim Miller
93fd2b5c30 am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 
* commit '2b6208599d5cd606cc3a685f6ae3d5b9acf5553b':
  Add summary for 0 fingerprint settings preference
 2015-09-19 01:22:40 +00:00
Jim Miller
50ee327fb9 am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 
* commit 'd251fed3ef24b02697a375bf32f382338f500f53':
  Add summary for 0 fingerprint settings preference
 2015-09-19 01:08:31 +00:00
Jim Miller
d251fed3ef Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 2015-09-19 00:59:51 +00:00
Justin Harrison
fa9d8258d4 am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev 
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
  Add color transform setting
 2015-09-19 00:46:06 +00:00
Adam Lesinski
c62f8ea234 am 0896a2e5: am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev 
* commit '0896a2e545f88785c2a07a4de91d4f5ea67c1a57':
  Update implementation to match BatteryStats.Uid
 2015-09-19 00:46:05 +00:00
Justin Harrison
a3add1d208 am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev 
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
  Add color transform setting
 2015-09-19 00:29:31 +00:00
Justin Harrison
c6a96d4076 Merge "Add color transform setting" into mnc-dr-dev 2015-09-19 00:21:45 +00:00
Adam Lesinski
1f78f774ca Update implementation to match BatteryStats.Uid 
(cherry picked from commit 2350b8445c)

Change-Id: I4289fbb912f3109d0be6a9ab4254bea4c2866d3d
 2015-09-18 17:12:30 -07:00
Jason Monk
0217281d33 Add color transform setting 
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
 2015-09-18 20:11:01 -04:00
Jim Miller
d433359684 Add summary for 0 fingerprint settings preference 
This allows the fingerprint summary to be shown when there
are no fingerprints.

Fixes bug 24172006

Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
 2015-09-18 15:37:48 -07:00
Adam Lesinski
65477c800f am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev 
* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
  Update implementation to match BatteryStats.Uid
 2015-09-18 20:32:04 +00:00
Adam Lesinski
031bbef57e Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev 2015-09-18 20:26:06 +00:00
Paul Lawrence
9db2961ad0 am 1ec8f89b: am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev 
* commit '1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583':
  Remove don't kill flag from CryptKeeper to stop logspam
 2015-09-18 14:58:04 +00:00
Paul Lawrence
1ec8f89b8e am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev 
* commit '98e9c7472ccb8f45220f73bf1c693f681681c00a':
  Remove don't kill flag from CryptKeeper to stop logspam
 2015-09-18 14:49:49 +00:00
Paul Lawrence
8d28491a2f am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev 
* commit 'c2e73bbc06739cdd55f7baaca8ab1aa915ee6e83':
  Remove don't kill flag from CryptKeeper to stop logspam
 2015-09-18 14:37:01 +00:00
Paul Lawrence
c2e73bbc06 Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev 2015-09-18 14:31:11 +00:00
Maurice Lam
771fac591f [WifiSettings] Add Wi-Fi dialog activity 
Add a Wi-Fi dialog activity that can be started by setup wizard to
connect to a Wi-Fi access point.

Also refactored mEdit and mModify in WifiConfigController into an
int-enum mMode, with modes view, connect and modify. This is how the
new modes maps to the old flags:

MODE_VIEW     --  mEdit = false, mModify = *
MODE_CONNECT  --  mEdit = true, mModify = false
MODE_MODIFY   --  mEdit = true, mModify = true

Bug: 23426311
Change-Id: I8e2221fd3c42577068e07686dab245dd5888e0ae
 2015-09-17 16:03:49 -07:00
Zach Jang
c87ceb7ec1 am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:04:18 +00:00
Michael Wright
dab743b95c Always show pairing dialog for device-specific keyboard. 
Bug: 22876536
Change-Id: Ief9f6343d435747050bb7910f934e4777f5116de
 2015-09-17 15:23:46 +01:00
Hyejin
7837e0272b am 375633ae: am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check 
* commit '375633aea2a5ba9b0fc3b099bead8bbfef6a4cf3':
  Fix IndexOutOfBoundsException while silent provisioning check
 2015-09-15 00:49:17 +00:00
Hyejin
375633aea2 am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check 
* commit '1dcb1135b8157977cd44c05768f422243d64df83':
  Fix IndexOutOfBoundsException while silent provisioning check
 2015-09-15 00:45:21 +00:00
Hyejin
7e84e35fb1 am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check 
* commit '5565b5cd7537e9360e6382507a45cf5e091a5108':
  Fix IndexOutOfBoundsException while silent provisioning check
 2015-09-15 00:29:32 +00:00
Hyejin
5565b5cd75 Fix IndexOutOfBoundsException while silent provisioning check 
- If hostpot off, we receive result through HotspotOffReceiver.
  Sometimes, during provisioning, we're used to receive this.
  In this case, we don't care.
  After provisioning, we'll receive the intent again.

- In stress test,
  index is sometimes invalid, equals to mCurrentTethers.size().
  So, when provisioning, We check whether index is valid or not.

BUG=23528220
Change-Id: I70f35e045042c6c81b1db03e2a44cd41d3e7437f
 2015-09-14 16:04:52 -07:00
Paul Lawrence
4f60679b76 Remove don't kill flag from CryptKeeper to stop logspam 
Bug: 23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
 2015-09-14 14:55:57 -07:00
Zach Jang
6ceb2ba9b8 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings 
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
 2015-09-14 14:03:12 -07:00
Maurice Lam
2662df8433 [WifiSettings] Submit Wi-Fi dialog with enter key 
Add a OnKeyListener for hardware keyboards and an
OnEditorActionListener for on-screen IMEs to submit the Wi-Fi dialog
with the currently entered information.

Before committing the action, check for whether the dialog is
submittable -- that is checking whether all necessary information has
been entered. If not the enter key behaves the same as it is before
the change.

Bug: 22211604
Change-Id: Idede4233a7385d3bcd8fd6614948270280536bf1
 2015-09-14 12:07:06 -07:00
Selim Cinek
e3be8eb3e5 am f19b9b6d: am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 
* commit 'f19b9b6d88f87a12723b3bf52f8d03bb6a831e83':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
 2015-09-12 05:07:53 +00:00
Jorim Jaggi
22bf95e650 am fb5aa541: am d59ce1f4: am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev 
* commit 'fb5aa5418ce4c103d8b2aa500cc4351e4b141397':
  Add timeout if we dont get onEnterAnimationComplete
 2015-09-12 02:57:18 +00:00
Jorim Jaggi
30c5aed420 am c350cd0f: am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev 
* commit 'c350cd0f87cb0c23e58159b8b75022fed5ce97d8':
  Finish trampoline activity for ConfirmDeviceCredential immediately
 2015-09-12 02:57:17 +00:00
Selim Cinek
f19b9b6d88 am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 
* commit '0fe43c9aec51d6389aa3e6943190a75a62b641be':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
 2015-09-12 00:56:55 +00:00
Selim Cinek
fc76ddd01e am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 
* commit 'cda53c5dc2c6a2c01dfd5db278a7899dd868da7d':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
 2015-09-12 00:38:18 +00:00
Selim Cinek
cda53c5dc2 Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 2015-09-12 00:28:09 +00:00
Selim Cinek
2547ea5b58 Fixed a bug where the ConfirmDeviceCredentials activity was shown twice. 
When rotating the ConfirmDeviceCredentials Activity, it was launched again after
solving the challenge.

Bug: 23937676
Change-Id: Ic0852448f498c79d5448c72cbc31bb55d9bfeddb
 2015-09-11 17:22:22 -07:00
Jorim Jaggi
fb5aa5418c am d59ce1f4: am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev 
* commit 'd59ce1f4e33cdc87af960ed3b35d0cf39afc00ff':
  Add timeout if we dont get onEnterAnimationComplete
 2015-09-11 23:30:43 +00:00
Jorim Jaggi
c350cd0f87 am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev 
* commit '97081aa929ea239937923359904f32ffa26f5180':
  Finish trampoline activity for ConfirmDeviceCredential immediately
 2015-09-11 23:30:42 +00:00
Jorim Jaggi
6f5bbc1b1e am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev 
* commit '5bd836aac3b7602a4166bc836aaa33ccc7107d74':
  Add timeout if we dont get onEnterAnimationComplete
 2015-09-11 22:33:38 +00:00
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
5bd836aac3 Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev 2015-09-11 22:14:06 +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
88957ef8ee Add timeout if we dont get onEnterAnimationComplete 
Window manager doesn't send us onEnterAnimationComplete in the case
where there are two activites starting at the same time and the
screen orientation is changing. Add a timeout to work around this
until we have a proper fix.

Bug: 23849216
Change-Id: I4be7787d1bc13f8cb0ffd892010c4b5c0142c783
 2015-09-11 14:02:45 -07:00
Maurice Lam
420965f93e Merge "[AccountSettings] Start add account in new task" 2015-09-11 18:10:45 +00:00
Jorim Jaggi
921c335121 am 908243c3: am a4b5e202: am 5628251b: am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev 
* commit '908243c3ea91bfb2a317daa5fe668006c717a62f':
  Fix crash in when restoring CredentialCheckResultTracker Fragment
 2015-09-11 03:50:44 +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
908243c3ea am a4b5e202: am 5628251b: am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev 
* commit 'a4b5e202d5a76f13d2c528fc9e589113a4955c20':
  Fix crash in when restoring CredentialCheckResultTracker Fragment
 2015-09-11 02:25:37 +00: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
Sanket Padawe
a1423547cf Disable configuring EAP-TLS/TTLS/PEAP without CA certificates. 
Bug: 15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
 2015-09-11 01:08:53 +00:00
Sanket Padawe
774a37b952 Fix crash in WiFi Settings test code. 
Bug: 23264452
Change-Id: I285512fe4c0dbc842e041b551819d650f5cf9bbe
 2015-09-11 01:02:38 +00:00
Maurice Lam
9e4aeb548f [AccountSettings] Start add account in new task 
Start add account activities in a new task separate from settings
so that users can reach it from recents later, even if they navigate
to a different settings screen (via launcher) like selecting Wi-Fi.

Bug: 22351974
Change-Id: Icd3e20fa8f2426276c52cd11cbc916c56ca86ee3
 2015-09-11 00:35:36 +00:00
Maurice Lam
6d07779c07 Merge "[ScreenLockSetup] Create separate title string" 2015-09-10 20:57:13 +00:00