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

9838 Commits

Author SHA1 Message Date
Maurice Lam
9a946b3cac am 63c8217b: am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit '63c8217bc95e5f29f0be5a964b45086c84372e35':
  [Fingerprint] Show skip button during SUW
 2015-07-24 17:21:19 +00:00
Maurice Lam
63c8217bc9 am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit '4ac567acce52d09a32e27dcdeacb1f7f899b5c08':
  [Fingerprint] Show skip button during SUW
 2015-07-24 16:07:00 +00:00
Svetoslav Ganov
c4b467e1f3 am 104c3d3d: am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit '104c3d3d641f87bd18c35cd2e0d584a515b9fb32':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 04:50:05 +00:00
Jason Monk
47067c7f29 am 6d280250: am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '6d2802502cbd69552de7a28c3850ec6d1a75cefc':
  Fix battery detail issues with "Android OS"
 2015-07-24 04:50:03 +00:00
Jason Monk
39c9460f38 am 5bc0d610: am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit '5bc0d610ab0dc003afe356a1c8851d668ad2f5d8':
  Don't show disabled apps in ignore optimizations
 2015-07-24 04:50:02 +00:00
Guang Zhu
5e83b0d9fa am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 04:50:00 +00:00
Pavel Zhamaitsiak
2fab133a24 am 5d652622: am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit '5d652622e836738cff848ec4597ddaca92658db5':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 04:49:59 +00:00
Colin Cross
dab025bdff resolved conflicts for merge of 769ba03b to master 
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
 2015-07-23 21:43:07 -07:00
Svetoslav Ganov
104c3d3d64 am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit 'ea80c4b2512a79e964968e235c85b145a089d3b9':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 03:46:08 +00:00
Jason Monk
6d2802502c am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit 'c9607b39f8e34b1091f28a27c47fb4dc408fd57c':
  Fix battery detail issues with "Android OS"
 2015-07-24 03:46:07 +00:00
Jason Monk
5bc0d610ab am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit 'c19eac29b6d439644e5fc5dc9504e126c61eb2e7':
  Don't show disabled apps in ignore optimizations
 2015-07-24 03:46:06 +00:00
Guang Zhu
29936b072f am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit '5ea94a9c4d27d02d989ab8571bde97112bb1747e':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 03:46:04 +00:00
Pavel Zhamaitsiak
5d652622e8 am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'ff381a20ca92597614f35507b663fdbcf8341cbf':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 03:45:57 +00:00
Jason Monk
769ba03b8f am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
  Remove tuner from development settings
 2015-07-24 03:45:55 +00:00
Maurice Lam
11d1f6d3a1 am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
  [Fingerprint] Show skip button during SUW
 2015-07-24 03:34:46 +00:00
Svetoslav Ganov
1fa5f4b336 am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit '6c2d4d73464e6026f42a615c75e3c5d7e3679d7b':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 03:10:41 +00:00
Jason Monk
e9b9736415 am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
  Fix battery detail issues with "Android OS"
 2015-07-24 03:10:07 +00:00
Jason Monk
9b6ff57eb5 am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
  Don't show disabled apps in ignore optimizations
 2015-07-24 03:10:05 +00:00
Maurice Lam
36c7601409 Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 2015-07-24 03:08:29 +00:00
Guang Zhu
b91da24db7 am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 03:03:26 +00:00
Pavel Zhamaitsiak
a20eaca1a6 am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'bdc3fc3672df250ea3fd3c8a3b73048ebc232ad4':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 03:03:24 +00:00
Jason Monk
b46b993403 am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
  Remove tuner from development settings
 2015-07-24 03:03:23 +00:00
Svetoslav Ganov
cce844a7a3 Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 2015-07-23 21:47:10 +00:00
Maurice Lam
95d1eb90d3 am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 20:26:15 +00:00
Maurice Lam
4e05ceea19 am 3b798650: am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '3b798650fc30a6b2b3b7a28325b7b40b8173baf1':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 20:26:14 +00:00
Jason Monk
8bf5f3075e Merge "Fix battery detail issues with "Android OS"" into mnc-dev 2015-07-23 20:23:57 +00:00
Jason Monk
9927acd3ad Merge "Don't show disabled apps in ignore optimizations" into mnc-dev 2015-07-23 20:23:09 +00:00
Maurice Lam
cff4eb9b73 am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 20:09:28 +00:00
Maurice Lam
3b798650fc am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 20:09:27 +00:00
Maurice Lam
7a33511397 am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 19:18:51 +00:00
Maurice Lam
705def9a22 am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit 'f1fbf9cca44d8a16bc1af92964558cf91ac00161':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 19:18:50 +00:00
Guang Zhu
c1bef7430e Prevent monkey from changing adoptable storage settings 
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
 2015-07-23 10:57:59 -07:00
Pavel Zhamaitsiak
d9e0ed1b3e Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 2015-07-23 16:54:55 +00:00
Svet Ganov
841bb3d336 Reset permissions and app links when clearing app preferences - settings 
bug:22359132

Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
 2015-07-23 09:40:16 -07:00
Pavel Zhamaitsiak
3e7e2c57d4 Add or remove WFC setting when Wireless settings activity is resumed 
WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.

Bug: 22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458
 2015-07-23 09:31:58 -07:00
Maurice Lam
5f8d7dbe52 [Fingerprint] Show skip button during SUW 
Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.

Bug: 22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1
 2015-07-22 16:51:47 -07:00
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Yasuhiro Matsuda
4a109b1d87 Handle the case where USB_STATE intent is not received yet. 
Call updateUsbConfigurationValues() when ACTION_USB_STATE intent
is not yet received so that mUsbConfiguration value is properly
initialized in this case.

BUG: 22163689
Change-Id: I2aeed43fc49e40c52cdc2bfc08d43081815b49d1
 2015-07-22 23:20:05 +09:00
Jason Monk
82f30d2a41 Fix battery detail issues with "Android OS" 
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
 2015-07-22 10:12:05 -04:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
3c1f46dc2c Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 2015-07-21 23:39:35 +00:00
Jorim Jaggi
f5b17e5588 Move PIN/Pattern appear animation to RenderThread (2/2) 
Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
 2015-07-21 15:34:26 -07:00
Maurice Lam
da433902d4 [Fingerprint] Send RESULT_CANCELED when back from Add another 
Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.

This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
  FingerprintEnrollFinish. If the user clicks back in
  FingerprintEnrollEnrolling, they will always go back to the
  previous screen with RESULT_CANCELED, which would either be
  FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
  possible outside of Setup Wizard, they will be back in Find Sensor,
  and pressing next will enroll an additional fingerprint.
  - Edge case: if the user enrolled the maximum number of
    fingerprints, and presses back, they will be bounced all the way
    back to Settings > Security.

Bug: 22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d
 2015-07-21 15:23:11 -07:00
Billy Lau
2e407c317a am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:51:31 +00:00
Billy Lau
90bc96f83d am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'f7011298eda26b6972a36a9735182fa6afd35093':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:36:48 +00:00
Billy Lau
bc3695c231 am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:06:42 +00:00
Amit Mahajan
dd871497f0 am e6e41f45: am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'e6e41f453d608b443be315f5e1a223054bfd2b68':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:58:22 +00:00
Amit Mahajan
e6e41f453d am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'a38dfb03c4054dbe08ffab01b8d42329e91fd639':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:44:46 +00:00
Billy Lau
d06ba151f5 Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 2015-07-21 17:37:08 +00:00
Amit Mahajan
c5459430a0 am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit '480692fab398a080be6648ddf424b3129f2c6cbc':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:17:45 +00:00