Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,953 Commits 1 Branch 0 Tags
6fa63e18629c52e4e72c8ce099dbe1b9af7ef2ed
Commit Graph

19953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
6fa63e1862 am f33e4e54: am 27f6e78a: am a8e22985: Automatically show IME when showing the fingerprint delete/rename dialog. 
* commit 'f33e4e54f97dc5bcbb1349dcfaee36840a0fe427':
  Automatically show IME when showing the fingerprint delete/rename dialog.
 2015-04-30 02:37:37 +00: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
e02626c9ee am bc83b5c9: am 0b10650c: am e77f0687: Returning to wizard, enable migration. 
* commit 'bc83b5c9c01d102d65c9d2fbcf188527d48efd7c':
  Returning to wizard, enable migration.
 2015-04-30 01:15:27 +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
Jim Miller
93390bfd11 Merge "Automatically show IME when showing the fingerprint delete/rename dialog." 2015-04-30 00:59:26 +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
Vinit Deshpande
c43f2c3e81 am fdb05f62: (-s ours) am 0db72add: am a03f330a: Merge "Implement \'Available via Passpoint\' feature [DO NOT MERGE]" into mnc-dev 
* commit 'fdb05f622135bb75a03d27bc73d95b42b5bee877':
  Implement 'Available via Passpoint' feature [DO NOT MERGE]
 2015-04-30 00:27:39 +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
d3b0cafb83 am 3a2f1c53: am f2536e87: am b880f142: Merge "Add user selectable Default Browser feature - part 3" into mnc-dev 
* commit '3a2f1c53492fb1966bcd17128d0662dcb590692b':
  Add user selectable Default Browser feature - part 3
 2015-04-29 21:52:09 +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
acd8beb50a am 558dc815: am afbcbf76: am 2add7d0d: Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev 
* commit '558dc81551dcece3967a02b1845907d3722bd844':
  [WifiSetup] Use default theme for Wi-Fi dialogs
 2015-04-29 18:57:31 +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
2e17d3f450 am a84e4761: am d5e533e4: am 28c3ba15: Merge "Allow filtering system apps on most app lists" into mnc-dev 
* commit 'a84e4761c77f95451fd77d9a952c59074f8ac964':
  Allow filtering system apps on most app lists
 2015-04-29 17:49:02 +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
b0d1d2d53e am ddfe8766: am 56adc0db: am 65037654: Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev 
* commit 'ddfe8766f4ee2dbb50859c1d2ab74992f709f596':
  Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
 2015-04-29 14:59:03 +00: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
40e02a8d1c am 4bf6f2be: (-s ours) am 07b4d287: (-s ours) am 623cd8c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4bf6f2bee8f951d7900571694582fe85ab68e4ea':
  Import translations. DO NOT MERGE
 2015-04-29 14:46:20 +00:00
John Spurlock
3bdf643a3d am 5cd144af: am 1e8a9f5f: am 0423aed7: Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev 
* commit '5cd144afc66f99b4cd789286160fce38072a7d01':
  Settings: "No interruptions" -> "Total silence"
 2015-04-29 14:46:19 +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
Geoff Mendal
3141270a1e Import translations. DO NOT MERGE 
Change-Id: If39a43ecd48ea382144660b0c47e864b014b239e
Auto-generated-cl: translation import
 2015-04-29 08:11:54 -05:00
Martijn Coenen
a570479c71 am 3ef56acd: am a0ee97f1: am 01d13c04: Merge "New Tap & Pay UX." into mnc-dev 
* commit '3ef56acd622778f8f8582bb2fc0c27fcd6973809':
  New Tap & Pay UX.
 2015-04-29 08:04:15 +00: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
033e3af21b am 9fd5ce62: am 6e86616d: am a16257db: Format as public/private; follow refactoring. 
* commit '9fd5ce625a1c85db2269030382da06fe056180a8':
  Format as public/private; follow refactoring.
 2015-04-29 05:52:56 +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