PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,502 Commits 1 Branch 0 Tags
0abb9b7d69fb2e6cf60b1c9952893dba1bb9201c
Commit Graph

22502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
8ff3e055b0 am fba2680e: am f9402321: Fix legal info back button 
* commit 'fba2680ebb63f0195b3267b7dec8d9cc413896fd':
  Fix legal info back button
 2015-06-10 15:56:34 +00:00
Xiyuan Xia
86a554091d Implement default assist app setting 
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
 2015-06-10 08:43:28 -07:00
Lorenzo Colitti
a41c3580a9 am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev 
* commit '275e6f75208c08eb925048a330ed4aab96e51033':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 15:42:35 +00:00
Geoff Mendal
f0e5a75508 am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '3e0514d7464c8da8fb4ce7fb132410cb53573bef':
  Import translations. DO NOT MERGE
 2015-06-10 15:42:34 +00:00
Jason Monk
fba2680ebb am f9402321: Fix legal info back button 
* commit 'f94023216accd128b06acdc50950e455a60a9c4e':
  Fix legal info back button
 2015-06-10 15:42:16 +00:00
Lorenzo Colitti
275e6f7520 Merge changes from topic 'no-internet-notification' into mnc-dev 
* changes:
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
 2015-06-10 15:25:27 +00:00
Geoff Mendal
3e0514d746 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 15:25:02 +00:00
Chris Wren
5b11ad2666 am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit 'fa8889a88c162595b8cac8d2749dff401a5ea39c':
  annoint new constants
 2015-06-10 15:11:55 +00:00
Jason Monk
68da427f48 am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries 
* commit '5365a8fd3a2aee18a0d6faecd43ad2994a09951c':
  Remove periods from ignore optimizations summaries
 2015-06-10 15:11:54 +00:00
Jason Monk
6dc33a5ac7 am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit '5b23db3ce61e5d2e43bb0f0757cf823c2d8f3d4d':
  Advanced apps updates (2/2)
 2015-06-10 15:11:53 +00:00
Jason Monk
83fde1b033 am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev 
* commit '6c6a212f0351a5711224f684c73123ff81d1504d':
  Add sd card string, just in case
 2015-06-10 15:11:52 +00:00
Neil Fuller
db8d0a9a37 am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit '54786a6adf695dcc1378bdbfc261590c91d0199a':
  Modifications for changes to SettingsLib
 2015-06-10 15:11:47 +00:00
Jason Monk
f94023216a Fix legal info back button 
Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
 2015-06-10 11:05:02 -04:00
Geoff Mendal
f61a092711 Import translations. DO NOT MERGE 
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
 2015-06-10 08:04:57 -07:00
Chris Wren
fa8889a88c am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit 'da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b':
  annoint new constants
 2015-06-10 14:54:38 +00:00
Jason Monk
5365a8fd3a am caec03f9: Remove periods from ignore optimizations summaries 
* commit 'caec03f9e51469776242908b4d877d7248c52875':
  Remove periods from ignore optimizations summaries
 2015-06-10 14:54:09 +00:00
Jason Monk
5b23db3ce6 am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit 'cc0f3b75b2692c7b57b2e839b18d224ed51f8082':
  Advanced apps updates (2/2)
 2015-06-10 14:54:08 +00:00
Jason Monk
6c6a212f03 am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev 
* commit '6f9b6e08a80b1d1e114808d1ac42e132888df185':
  Add sd card string, just in case
 2015-06-10 14:54:07 +00:00
Neil Fuller
54786a6adf am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit 'c28330ec3e6e808427cc17fd4060c3c0a7fa3462':
  Modifications for changes to SettingsLib
 2015-06-10 14:53:56 +00:00
Lorenzo Colitti
c6d997271a Add a string for switching to cell when Wi-Fi loses backhaul. 
We have not yet decided whether to surface this setting, but
we need to get it in before string freeze in case we do want to
expose it.

Bug: 20896761
Change-Id: I1c99229a284a0ae86ab191ae90a7dff497984fea
 2015-06-10 23:38:19 +09:00
Lorenzo Colitti
2593589209 Pass in the netId using intent data, not intent extras. 
This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.

Bug: 20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9
 2015-06-10 23:38:16 +09:00
Lorenzo Colitti
dcc6155426 Reword "no internet access" dialog to conform with mocks. 
Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
 2015-06-10 23:38:09 +09:00
Geoff Mendal
3d13289445 Import translations. DO NOT MERGE 
Change-Id: I1443efca13a2db968124615503625164ba2aa0ec
Auto-generated-cl: translation import
 2015-06-10 07:33:59 -07:00
Chris Wren
da6a4904a9 Merge "annoint new constants" into mnc-dev 2015-06-10 14:14:45 +00:00
Jason Monk
caec03f9e5 Remove periods from ignore optimizations summaries 
Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
 2015-06-10 09:04:14 -04:00
Jason Monk
cc0f3b75b2 Merge "Advanced apps updates (2/2)" into mnc-dev 2015-06-10 12:59:33 +00:00
Jason Monk
6f9b6e08a8 Merge "Add sd card string, just in case" into mnc-dev 2015-06-10 12:59:30 +00:00
Neil Fuller
c28330ec3e Merge "Modifications for changes to SettingsLib" into mnc-dev 2015-06-10 12:23:49 +00:00
The Android Automerger
3f94f562c1 merge in mnc-release history after reset to mnc-dev 2015-06-10 01:04:19 -07:00
Jeff Brown
b18130c0df Add simulated 4K display modes. 
Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
 2015-06-09 19:52:24 -07:00
Fyodor Kupolov
1f95d23015 am bf25b219: am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev 
* commit 'bf25b219ab50e658bf90dc6e88b41c0c7e05e4c2':
  Guest option should not be shown for the guest user
 2015-06-09 23:33:40 +00:00
Fyodor Kupolov
bf25b219ab am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev 
* commit 'af27f96bc61ed23658696d440919b286ea4d747a':
  Guest option should not be shown for the guest user
 2015-06-09 23:23:44 +00:00
Fyodor Kupolov
af27f96bc6 am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev 
* commit '8e2c47870188c0732a1130b505748f07b23fa66c':
  Guest option should not be shown for the guest user
 2015-06-09 23:06:14 +00:00
Fyodor Kupolov
8e2c478701 Merge "Guest option should not be shown for the guest user" into mnc-dev 2015-06-09 22:57:27 +00:00
Fyodor Kupolov
c478885d8d Guest option should not be shown for the guest user 
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
 2015-06-09 15:55:01 -07:00
Casper Bonde
4bc913b7c5 am fa9fcf11: am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5) 
* commit 'fa9fcf119b6e44b1b1deaa8a080baa9e087ef31c':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)
 2015-06-09 22:19:53 +00:00
Casper Bonde
fa9fcf119b am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5) 
* commit 'b94840712e9257e6f38446c7d7a3c4d3d79cf089':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)
 2015-06-09 22:09:38 +00:00
Casper Bonde
b94840712e am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5) 
* commit 'e278a208bc8298963080dfb5352acedc65aad083':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)
 2015-06-09 21:56:56 +00:00
Paul Lawrence
2a7e131111 am 0060fb1a: am cb3063dd: am 2114e386: Merge "Move CryptKeeper to own process" into mnc-dev 
* commit '0060fb1a140c9a3b430b726a7d0a467e6af3e8cc':
  Move CryptKeeper to own process
 2015-06-09 21:42:17 +00:00
Casper Bonde
e278a208bc SAP: Make it possible to enforce a 16-digit pin code (5/5) 
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-09 21:42:15 +00:00
Paul Lawrence
0060fb1a14 am cb3063dd: am 2114e386: Merge "Move CryptKeeper to own process" into mnc-dev 
* commit 'cb3063ddda573d297b769b3134d1ebb673863393':
  Move CryptKeeper to own process
 2015-06-09 21:26:11 +00:00
Paul Lawrence
cb3063ddda am 2114e386: Merge "Move CryptKeeper to own process" into mnc-dev 
* commit '2114e386a4fabe060784a7077eaee9e13ef3af59':
  Move CryptKeeper to own process
 2015-06-09 21:12:35 +00:00
Jason Monk
877c1dfd2a am a59d4b9c: am 0087749f: am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 
* commit 'a59d4b9cd15e659edb451b22ee8dac5ea285cc83':
  Top level: "Storage" -> "Storage & USB"
 2015-06-09 21:11:57 +00:00
Paul Lawrence
2114e386a4 Merge "Move CryptKeeper to own process" into mnc-dev 2015-06-09 21:00:21 +00:00
Jason Monk
a59d4b9cd1 am 0087749f: am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 
* commit '0087749f66d299f1687475f56f340cf9cc42ef51':
  Top level: "Storage" -> "Storage & USB"
 2015-06-09 20:59:19 +00:00
Jason Monk
0087749f66 am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 
* commit '51f7c067aac2d9326ff0569027d0dff2aa67f538':
  Top level: "Storage" -> "Storage & USB"
 2015-06-09 20:40:10 +00:00
Jason Monk
51f7c067aa Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 2015-06-09 20:30:35 +00:00
Jason Monk
1169e1295d am 40aba9d8: am 8987128d: am 4ab327b0: Merge "Accounts -> Account sync" into mnc-dev 
* commit '40aba9d87cf6878fe5468136493d2633002a00d2':
  Accounts -> Account sync
 2015-06-09 20:27:57 +00:00
Jason Monk
0a6704382a am 2ad9a3ab: am 3ab21b90: am fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev 
* commit '2ad9a3ab7dbabbd80f3c71a80ea869e7ae5399d4':
  Bring back gear icon for advanced app settings
 2015-06-09 20:27:56 +00:00
Jason Monk
4da8e84432 Add sd card string, just in case 
Bug: 21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
 2015-06-09 16:26:07 -04:00