PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,847 Commits 1 Branch 0 Tags
aa38035ef57e35a1dbf3f0d50167d73fe15d321c
Commit Graph

23847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Monk
618bc11b0d am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role 
* commit '72fecf9f0a640554d9c00e087e4cb2ce8fea3d77':
  Include the usb data mode regardless of data role
 2015-09-10 20:41:37 +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
Maurice Lam
7d8ebeea94 [ScreenLockSetup] Create separate title string 
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.

Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
 2015-09-10 12:05:14 -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
cb9d7a96bb resolved conflicts for 99bbec73 to master 
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
 2015-09-09 18:48:27 -07:00
Jorim Jaggi
99bbec733d am f37368db: am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit 'f37368db841ce534cc1712b54b1c88bcbe991756':
  Add double-tap power button to open camera 2/2
 2015-09-10 01:11:44 +00:00
Maurice Lam
3fac92ff7e Merge "[WifiSetup] Suppress crash during Wi-Fi setup" 2015-09-10 01:03:54 +00:00
Jorim Jaggi
f37368db84 am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit 'ef5f9e3952ac35df4ce4335be0020ae81b11f746':
  Add double-tap power button to open camera 2/2
 2015-09-10 01:02:39 +00: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
a04ebb412c am eddb0493: am 93b39ff9: am 01f44efa: 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 reache 
* commit 'eddb04934b2b52ab0ff6545515df8f0801f538c0':
  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:22:50 +00:00
Jim Miller
eddb04934b am 93b39ff9: am 01f44efa: 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 (FINGERPRIN 
* commit '93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
  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:14:27 +00:00
Jim Miller
93b39ff9bd am 01f44efa: 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_TIMEO 
* commit '01f44efab0673e8648470c8be1670730660a4778':
  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:08:06 +00:00
Maurice Lam
f402d8ffd7 [WifiSetup] Suppress crash during Wi-Fi setup 
Bug: 23936498
Change-Id: I7d97995cfb3c904aee3fc1baa50ea3dafe7d72ea
 2015-09-09 16:03:00 -07: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
7149a85507 am 605685ce: am 5fc62441: am 9819dcb9: am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '605685ceae58d6a0c920ec4f809cf11cd32c34e1':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 18:32:10 +00:00
Sungmin Choi
605685ceae am 5fc62441: am 9819dcb9: am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '5fc624418c11d8a949c6ab61fa3c0b0bc2fb2d46':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 18:14:08 +00:00