PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,918 Commits 1 Branch 0 Tags
1a1c7ca9471df1327f28a850c9f6f523e46b748e
Commit Graph

19918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
1a1c7ca947 am f1039a79: am d527f420: Merge "Handle no peeking in app info pages" into mnc-dev 
* commit 'f1039a7902de7addc1292818e920dbe412ee9c70':
  Handle no peeking in app info pages
 2015-04-30 16:16:03 +00:00
Jason Monk
f1039a7902 am d527f420: Merge "Handle no peeking in app info pages" into mnc-dev 
* commit 'd527f420860e8dfaa7fd87d0c53220fcd87ec5b6':
  Handle no peeking in app info pages
 2015-04-30 15:45:30 +00:00
Jason Monk
d527f42086 Merge "Handle no peeking in app info pages" into mnc-dev 2015-04-30 15:33:39 +00:00
Jason Monk
25f9e326ab Handle no peeking in app info pages 
Bug: 20496400
Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4
 2015-04-30 11:27:27 -04:00
Jim Miller
f33e4e54f9 am 27f6e78a: am a8e22985: Automatically show IME when showing the fingerprint delete/rename dialog. 
* commit '27f6e78a70b0f86d8e9a2c0a33c64e92ee912c74':
  Automatically show IME when showing the fingerprint delete/rename dialog.
 2015-04-30 02:22:19 +00:00
Jim Miller
27f6e78a70 am a8e22985: Automatically show IME when showing the fingerprint delete/rename dialog. 
* commit 'a8e22985d7866fb0528d85d9710a5bc0f482d91a':
  Automatically show IME when showing the fingerprint delete/rename dialog.
 2015-04-30 02:08:18 +00:00
Jim Miller
a8e22985d7 Automatically show IME when showing the fingerprint delete/rename dialog. 
Also a bit of code clean up.

Change-Id: I541a9c9ec031b7075f2812ef938adb9e591757c5
(cherry picked from commit 86ccad0bfd)
 2015-04-30 01:59:43 +00:00
Jeff Sharkey
bc83b5c9c0 am 0b10650c: am e77f0687: Returning to wizard, enable migration. 
* commit '0b10650ce5803eba272f84810fbd3dd15e3569c0':
  Returning to wizard, enable migration.
 2015-04-30 01:01:55 +00:00
Jeff Sharkey
0b10650ce5 am e77f0687: Returning to wizard, enable migration. 
* commit 'e77f0687dd424ccfdc2b1061221c6c8ba4d6ac8d':
  Returning to wizard, enable migration.
 2015-04-30 00:48:17 +00:00
Jeff Sharkey
e77f0687dd Returning to wizard, enable migration. 
Bring primary storage migration back into the adoption flow, and
provide a path for long-lived notifications to re-launch into the
Settings app.  Also provide option to initiate migration if skipped
during wizard.  For now, estmiate migration size and time based on
a Class 10 card.

Follow other callback refactoring.

Bug: 19993667
Change-Id: Ia0c28eb114bc6c8066c17b3142ed74f962140c91
 2015-04-29 17:24:12 -07:00
Vinit Deshpande
fdb05f6221 am 0db72add: am a03f330a: Merge "Implement \'Available via Passpoint\' feature [DO NOT MERGE]" into mnc-dev 
* commit '0db72add0ccd1b22b17161fe28c91c6e4671442a':
  Implement 'Available via Passpoint' feature [DO NOT MERGE]
 2015-04-30 00:16:28 +00:00
Vinit Deshpande
0db72add0c am a03f330a: Merge "Implement \'Available via Passpoint\' feature [DO NOT MERGE]" into mnc-dev 
* commit 'a03f330af31714e44f67ca09cad66f91a8acbdd2':
  Implement 'Available via Passpoint' feature [DO NOT MERGE]
 2015-04-30 00:07:44 +00:00
Vinit Deshpande
a03f330af3 Merge "Implement 'Available via Passpoint' feature [DO NOT MERGE]" into mnc-dev 2015-04-29 23:51:57 +00:00
Fabrice Di Meglio
3a2f1c5349 am f2536e87: am b880f142: Merge "Add user selectable Default Browser feature - part 3" into mnc-dev 
* commit 'f2536e87c271b1c0c5eee3c4973d02c5211e6760':
  Add user selectable Default Browser feature - part 3
 2015-04-29 21:39:57 +00:00
Fabrice Di Meglio
f2536e87c2 am b880f142: Merge "Add user selectable Default Browser feature - part 3" into mnc-dev 
* commit 'b880f1424bd743c6e0daa748ad9ba33030b0166c':
  Add user selectable Default Browser feature - part 3
 2015-04-29 21:27:24 +00:00
Fabrice Di Meglio
b880f1424b Merge "Add user selectable Default Browser feature - part 3" into mnc-dev 2015-04-29 21:16:18 +00:00
Fabrice Di Meglio
d5f379304c Add user selectable Default Browser feature - part 3 
- fix preference summary

See bug #20144393

Change-Id: I4ecf46e69bf6bafda87dbc05b7c2f68bbca725cb
 2015-04-29 14:12:19 -07:00
Vinit Deshpande
a2fd307651 Implement 'Available via Passpoint' feature [DO NOT MERGE] 
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit 08b5b5d439)
 2015-04-29 19:32:50 +00:00
Maurice Lam
558dc81551 am afbcbf76: am 2add7d0d: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 
* commit 'afbcbf76340f5071424ebe079e385ff0904918cd':
  [WifiSetup] Use default theme for Wi-Fi dialogs
 2015-04-29 18:37:40 +00:00
Maurice Lam
afbcbf7634 am 2add7d0d: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 
* commit '2add7d0d0528fd5823471dbe338f4b5b20773efb':
  [WifiSetup] Use default theme for Wi-Fi dialogs
 2015-04-29 18:25:45 +00:00
Maurice Lam
2add7d0d05 Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 2015-04-29 18:17:16 +00:00
Jason Monk
a84e4761c7 am d5e533e4: am 28c3ba15: Merge "Allow filtering system apps on most app lists" into mnc-dev 
* commit 'd5e533e4bc12cc1db067262cefe35029701fa9b1':
  Allow filtering system apps on most app lists
 2015-04-29 17:37:34 +00:00
Jason Monk
d5e533e4bc am 28c3ba15: Merge "Allow filtering system apps on most app lists" into mnc-dev 
* commit '28c3ba156f06e8f021ff6eabababe1a8627ff100':
  Allow filtering system apps on most app lists
 2015-04-29 17:23:35 +00:00
Jason Monk
28c3ba156f Merge "Allow filtering system apps on most app lists" into mnc-dev 2015-04-29 17:10:35 +00:00
Jason Monk
fbaf4363f6 Allow filtering system apps on most app lists 
Change-Id: If852adec4122aca3f11b0f894c0c44d12a75cc77
 2015-04-29 13:02:08 -04:00
Andrei Kapishnikov
ddfe8766f4 am 56adc0db: am 65037654: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev 
* commit '56adc0db8174f08c33dd596db01aa641d8b63ffb':
  Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
 2015-04-29 14:46:26 +00:00
Geoff Mendal
4bf6f2bee8 am 07b4d287: (-s ours) am 623cd8c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '07b4d28755fda78f273dc04579a03469df0b5d4f':
  Import translations. DO NOT MERGE
 2015-04-29 14:32:21 +00:00
John Spurlock
5cd144afc6 am 1e8a9f5f: am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '1e8a9f5fd33a1f3e27921cf2a555c6bb199a9ffe':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:32:18 +00:00
Andrei Kapishnikov
56adc0db81 am 65037654: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev 
* commit '65037654623752e2336044390946c59ac8cfa128':
  Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
 2015-04-29 14:29:20 +00:00
Geoff Mendal
07b4d28755 am 623cd8c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '623cd8c293f9ea8974efe5caaca16a250bee0b00':
  Import translations. DO NOT MERGE
 2015-04-29 14:16:15 +00:00
John Spurlock
1e8a9f5fd3 am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '0423aed775d0b00cbdf6cc1b422ede704830d43a':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:16:12 +00:00
Andrei Kapishnikov
6503765462 Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev 2015-04-29 14:13:40 +00:00
Geoff Mendal
623cd8c293 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 14:07:34 +00:00
John Spurlock
0423aed775 Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 2015-04-29 14:02:55 +00:00
Geoff Mendal
185c8fd6da Import translations. DO NOT MERGE 
Change-Id: Ibbdc2e71ca955cc4cfc648b2f54d592cf5285725
Auto-generated-cl: translation import
 2015-04-29 09:01:14 -05:00
Martijn Coenen
3ef56acd62 am a0ee97f1: am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit 'a0ee97f1962cb96ec3e3fc865c6174d5fad2556c':
  New Tap & Pay UX.
 2015-04-29 07:53:17 +00:00
Martijn Coenen
a0ee97f196 am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit '01d13c043a7d9f2aef357e17f2d6a36c678006e6':
  New Tap & Pay UX.
 2015-04-29 07:41:50 +00:00
Martijn Coenen
01d13c043a Merge "New Tap & Pay UX." into mnc-dev 2015-04-29 07:29:32 +00:00
Jeff Sharkey
9fd5ce625a am 6e86616d: am a16257db: Format as public/private; follow refactoring. 
* commit '6e86616df7d92a1a628d773c37f6d134d1e7edac':
  Format as public/private; follow refactoring.
 2015-04-29 05:41:35 +00:00
Jeff Sharkey
6e86616df7 am a16257db: Format as public/private; follow refactoring. 
* commit 'a16257dbd5599135320f4263a2cb438b7a469084':
  Format as public/private; follow refactoring.
 2015-04-29 05:29:52 +00:00
Jeff Sharkey
a16257dbd5 Format as public/private; follow refactoring. 
Offer to format an empty disk as public/private.

Bug: 19993667
Change-Id: I69fafaed524f3ef5e65d04a9e3a94789fcfc3087
 2015-04-28 21:54:54 -07:00
Andrei Kapishnikov
146fc11958 Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag 
When DO_NOT_ASK_CREDENTIALS_ON_BOOT flag is set in
DevicePolicyManager, the Settings UI:
1) Should not encrypt the device with password when the
   user encrypts the device for the first time. The default
   encryption type should be used instead.
2) Should not give the choice to the user whether to
   encrypt the device with password/PIN or not but always
   encrypt the device without password.

Related CL: https://googleplex-android-review.git.corp.google.com/#/c/665371/

Change-Id: Ic09f02c033a0b16b7ffc45bf6d675b62d1be4bd8
 2015-04-29 02:53:53 +00:00
Fabrice Di Meglio
d908e2b64d am a7d30e64: am 02c89944: Merge "Add user selectable Default Browser feature - part 2" into mnc-dev 
* commit 'a7d30e64f7b11db70884635b3965aa52e54c2e36':
  Add user selectable Default Browser feature - part 2
 2015-04-29 02:01:26 +00:00
Adrian Roos
b462828178 am ccbe03cb: am fb4c4de8: Merge "Require explicit userId in LockPatternUtils" into mnc-dev 
* commit 'ccbe03cb82f36661b7578a6b9b276dd65db75332':
  Require explicit userId in LockPatternUtils
 2015-04-29 02:01:24 +00:00
Elliott Hughes
0dd8dbf59b am 90f9bed6: am 28077b9c: Add Pacific/Noumea. 
* commit '90f9bed6d434996b87fafba92f37641d516d38eb':
  Add Pacific/Noumea.
 2015-04-29 02:01:23 +00:00
Jorim Jaggi
25bafe1178 am 8f476cda: am 441ea80d: Add animation for fingerprint icon 
* commit '8f476cdace0c72681d226f0a21767225a329a04b':
  Add animation for fingerprint icon
 2015-04-29 02:01:22 +00:00
Yorke Lee
83cdcf1052 am 8dbd3e74: am 0b31dc54: Merge "Simplify DefaultDialerManager" into mnc-dev 
* commit '8dbd3e74c374b9c7231ca1fcba27a9bff9f47a33':
  Simplify DefaultDialerManager
 2015-04-29 02:01:20 +00:00
Fabrice Di Meglio
a7d30e64f7 am 02c89944: Merge "Add user selectable Default Browser feature - part 2" into mnc-dev 
* commit '02c89944d13fa473c9fb0da3c5a69777a25fe048':
  Add user selectable Default Browser feature - part 2
 2015-04-29 01:45:06 +00:00
Adrian Roos
ccbe03cb82 am fb4c4de8: Merge "Require explicit userId in LockPatternUtils" into mnc-dev 
* commit 'fb4c4de81d72faa13bd4f0629b0272d2668d884b':
  Require explicit userId in LockPatternUtils
 2015-04-29 01:43:10 +00:00
Elliott Hughes
90f9bed6d4 am 28077b9c: Add Pacific/Noumea. 
* commit '28077b9cc86388f9b5dfa29a79a5a42c3d545d29':
  Add Pacific/Noumea.
 2015-04-29 01:43:09 +00:00