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

21094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Jang
61b8955c86 am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '8fef0576518fa9baaf701e1da5564c2f6f2d9645':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:37:15 +00:00
Zach Jang
825518b7b9 am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '2ead093496c3b5b266c21a483c4f0c37869d57de':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:37:14 +00:00
Zach Jang
8fef057651 am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '7b2994d2e87eafe84425666aba8f818e661a6fac':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:30:07 +00:00
Zach Jang
2ead093496 am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '386c7763eb8cd3e856a26fe3cbd39cc573978c29':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:30:06 +00:00
Zach Jang
7b2994d2e8 am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '1304f47c1b63d1daa001f4d1c209a34f1b3af5d3':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:06:16 +00:00
Zach Jang
386c7763eb am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:06:13 +00:00
Zach Jang
1304f47c1b am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '5cac896612ead73d08acb588e2f62512f8789cf4':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 19:05:39 +00:00
Zach Jang
564ec9357b am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 19:05:36 +00:00
Zach Jang
5cac896612 am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '8fc9b5b68494ac341b882623b1cbe124fd6256f8':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 18:58:23 +00:00
Zach Jang
00721b4afa am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 18:58:12 +00:00
Baligh Uddin
2d0db3098e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:07 +00:00
Paul Lawrence
0f1e7bfe19 Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev 2015-09-19 02:32:23 +00:00
Paul Lawrence
b33741fce7 Revert "Remove don't kill flag from CryptKeeper to stop logspam" 
This reverts commit 4f60679b76.

Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
 2015-09-19 02:29:37 +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
c6a96d4076 Merge "Add color transform setting" into mnc-dr-dev 2015-09-19 00:21:45 +00: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
031bbef57e Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev 2015-09-18 20:26:06 +00:00
Baligh Uddin
8223038551 Import translations. DO NOT MERGE 
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
 2015-09-18 10:37:08 -07:00
Paul Lawrence
43be4b9b78 Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev 2015-09-18 15:26: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
Zach Jang
8fc9b5b684 am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:40:30 +00:00
Zach Jang
2e006b2b07 am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48 am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8 am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:04:24 +00: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
Paul Lawrence
44985b9ccd Stop long passwords crashing CryptKeeper 
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
 2015-09-16 15:29:57 -07:00
Baligh Uddin
ba98cc2c14 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-15 14:12:42 +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
Baligh Uddin
6ea05b747d Import translations. DO NOT MERGE 
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
 2015-09-14 03:20:45 -07: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
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
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
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
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
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
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
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