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

23296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
6ea05b747d Import translations. DO NOT MERGE 
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
 2015-09-14 03:20:45 -07: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
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
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
723c5b38b8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-11 16:19:17 +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
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
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
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
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
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
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
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
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
Sungmin Choi
5fc624418c am 9819dcb9: am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 18:06:25 +00: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