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

24619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
6ea05b747d Import translations. DO NOT MERGE 
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
 2015-09-14 03:20:45 -07:00
Baligh Uddin
eb1c872563 Import translations. DO NOT MERGE 
Change-Id: I80c5843b1be74f3b58aa812986ff04680f588b2c
Auto-generated-cl: translation import
 2015-09-14 02:48:18 -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
0fe43c9aec am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 
* commit 'fc76ddd01e165e9641349cc721b294d62ce268e5':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
 2015-09-12 00:47:34 +00:00
Zach Jang
e7e0c03f00 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings 
CL#3/3

b/23946860

Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
 2015-09-12 00:40:20 +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
d59ce1f4e3 am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev 
* commit '6f5bbc1b1e73b3559e311ea2e59a2281b67f65ca':
  Add timeout if we dont get onEnterAnimationComplete
 2015-09-11 23:22:17 +00:00
Jorim Jaggi
97081aa929 am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev 
* commit 'c77839e0e12aaa656a65d5c3ff6da33cb0a76d46':
  Finish trampoline activity for ConfirmDeviceCredential immediately
 2015-09-11 23:22:16 +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
Baligh Uddin
e55e9c21fe am 7e681ef5: (-s ours) am ad4de2fa: (-s ours) am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE 
* commit '7e681ef59442d803c7b9bc33fa92a3c8a15c5796':
  Import translations. DO NOT MERGE
 2015-09-11 17:00:28 +00:00
Baligh Uddin
7e681ef594 am ad4de2fa: (-s ours) am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad4de2fa60a490bf922051c515cf8ac0a133a8cf':
  Import translations. DO NOT MERGE
 2015-09-11 16:50:21 +00:00
Baligh Uddin
5f1b486117 am 5215f65c: (-s ours) am 730a73da: (-s ours) am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5215f65c167fbe0814155273a0c4348cc8dac2f4':
  Import translations. DO NOT MERGE
 2015-09-11 16:47:18 +00:00
Baligh Uddin
ad4de2fa60 am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE 
* commit 'c5d183458c13a0d780aee93f256ea5dc6b22f815':
  Import translations. DO NOT MERGE
 2015-09-11 16:41:33 +00:00
Baligh Uddin
5215f65c16 am 730a73da: (-s ours) am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '730a73daace1bafb86eeceb79b6d623d2feab2d9':
  Import translations. DO NOT MERGE
 2015-09-11 16:40:01 +00:00
Baligh Uddin
c5d183458c am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE 
* commit 'cdf00b1640bc621d513dcb965f44a4ace8bacece':
  Import translations. DO NOT MERGE
 2015-09-11 16:32:04 +00:00
Baligh Uddin
730a73daac am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'cf80d7c4f03f8c55963b4815c1b7004d77cb9e5b':
  Import translations. DO NOT MERGE
 2015-09-11 16:30:31 +00:00
Baligh Uddin
cf80d7c4f0 am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '723c5b38b8fbd2db3a64b1ce782f8f760271ac98':
  Import translations. DO NOT MERGE
 2015-09-11 16:24:31 +00:00
Baligh Uddin
cdf00b1640 am 1538dde4: (-s ours) Import translations. DO NOT MERGE 
* commit '1538dde4fbb00617bfd1d51f958f32ba4d68ff12':
  Import translations. DO NOT MERGE
 2015-09-11 16:24:21 +00:00
Baligh Uddin
c0191b5503 Merge "Import translations. DO NOT MERGE" 2015-09-11 16:19:23 +00:00
Baligh Uddin
723c5b38b8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-11 16:19:17 +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
a4b5e202d5 am 5628251b: am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev 
* commit '5628251b1bf051e73b6a8f1edd50b3e7447b06eb':
  Fix crash in when restoring CredentialCheckResultTracker Fragment
 2015-09-11 02:18:10 +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
Baligh Uddin
196555c71b Import translations. DO NOT MERGE 
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
 2015-09-10 14:56:41 -07:00
Baligh Uddin
1538dde4fb Import translations. DO NOT MERGE 
Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5
Auto-generated-cl: translation import
 2015-09-10 14:53:10 -07:00
Baligh Uddin
153a69c597 Import translations. DO NOT MERGE 
Change-Id: I8e301f2fd2ee2b4e2e91b5e7f3b910ebf708f7cd
Auto-generated-cl: translation import
 2015-09-10 14:24:34 -07:00
Maurice Lam
6d07779c07 Merge "[ScreenLockSetup] Create separate title string" 2015-09-10 20:57:13 +00:00
Jason Monk
f2686165cf am cde29f77: am 618bc11b: am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role 
* commit 'cde29f771a85dc3f7e5b567ffcaa07aaa486fcf4':
  Include the usb data mode regardless of data role
 2015-09-10 20:53:52 +00:00
Jason Monk
cde29f771a am 618bc11b: am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role 
* commit '618bc11b0da63c25e70678d8fadf5f01ca7f13ec':
  Include the usb data mode regardless of data role
 2015-09-10 20:48:48 +00:00