Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,139 Commits 1 Branch 0 Tags
6d57737d46a0e31d13fbe9b5de4e042b034bf891
Commit Graph

17139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
6d57737d46 am ac0d5d95: (-s ours) am d4936ba9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'ac0d5d95a7bf00165f77603f26f3a2439aaaefc0':
  Import translations. DO NOT MERGE
 2014-10-02 12:47:36 +00:00
Zoltan Szatmary-Ban
9c4e4cae03 am e40a207b: am 231c4a23: am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 
* commit 'e40a207b06814509f3fb7daafc61b2bea151d0ee':
  Disambiguate categories in Settings > Trusted Credentials
 2014-10-02 12:47:35 +00:00
Maurice Lam
92ed83adb6 am ed5ab3e5: am a1ecc44f: am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev 
* commit 'ed5ab3e5d555238489ea8880f5d7211e93f3890f':
  [WifiSetup] Update background texture
 2014-10-02 12:47:34 +00:00
Svetoslav
fa9699c13d am 4b2fc1ad: am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit '4b2fc1adad9e27b9a78732a87678297834f82e9c':
  Use default encryption password if an accessibility service is enabled.
 2014-10-02 12:47:33 +00:00
Fabrice Di Meglio
0209d691d9 am 37d89ffb: am 3d2441f7: am 3cc8fe3b: am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev 
* commit '37d89ffb65b751807216dbae0c1c47ecac17979b':
  Update Settings App icons
 2014-10-02 12:47:32 +00:00
PauloftheWest
955ead53bd am 544ed0ef: am cd93da02: am 8506c378: am cc6736bf: am 29aab7a2: Fixed a Settings crash. 
* commit '544ed0ef8e72191f76cda597475d4ae3da963cb9':
  Fixed a Settings crash.
 2014-10-02 12:47:31 +00:00
Baligh Uddin
44b324c526 am 7e09be13: (-s ours) am 91b315c1: (-s ours) am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7e09be13705bad913555dedbf7fb16403bc401fb':
  Import translations. DO NOT MERGE
 2014-10-02 12:47:30 +00:00
PauloftheWest
9d31ad24f1 am 2f11848c: am db464694: am c4ef9bf8: am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit '2f11848cbf02ff8c1a75303ee4c0e2b63b002e43':
  Fixed multiple MAP issues.
 2014-10-02 12:47:29 +00:00
Baligh Uddin
ac0d5d95a7 am d4936ba9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'd4936ba987bbd9ea1c6ef441bd9bce8d691e0145':
  Import translations. DO NOT MERGE
 2014-10-02 12:37:34 +00:00
Zoltan Szatmary-Ban
e40a207b06 am 231c4a23: am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 
* commit '231c4a231531cadd451c3beeb360de4a72ad6ae2':
  Disambiguate categories in Settings > Trusted Credentials
 2014-10-02 12:37:20 +00:00
Maurice Lam
ed5ab3e5d5 am a1ecc44f: am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev 
* commit 'a1ecc44fa8802c0a931aec833910d515c88928af':
  [WifiSetup] Update background texture
 2014-10-02 12:37:19 +00:00
Svetoslav
4b2fc1adad am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit '7358b7d56286d1896f833bbd9d970b83dfb5fed1':
  Use default encryption password if an accessibility service is enabled.
 2014-10-02 12:37:18 +00:00
Fabrice Di Meglio
37d89ffb65 am 3d2441f7: am 3cc8fe3b: am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev 
* commit '3d2441f7766fd28c0e08a28eaf0a4f9315533cf0':
  Update Settings App icons
 2014-10-02 12:37:17 +00:00
PauloftheWest
544ed0ef8e am cd93da02: am 8506c378: am cc6736bf: am 29aab7a2: Fixed a Settings crash. 
* commit 'cd93da0235c61061d1eb335783183766c484cab2':
  Fixed a Settings crash.
 2014-10-02 12:37:16 +00:00
Baligh Uddin
7e09be1370 am 91b315c1: (-s ours) am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '91b315c1d6afac99f51e58488a14d4a1d8498f3a':
  Import translations. DO NOT MERGE
 2014-10-02 12:37:16 +00:00
PauloftheWest
2f11848cbf am db464694: am c4ef9bf8: am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit 'db46469432b67550b9b5968d7aa4004121332b0d':
  Fixed multiple MAP issues.
 2014-10-02 12:37:16 +00:00
Baligh Uddin
d4936ba987 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 19:29:14 +00:00
Zoltan Szatmary-Ban
231c4a2315 am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 
* commit 'b5550a65c089f230a58b636c9a55c61a054d169b':
  Disambiguate categories in Settings > Trusted Credentials
 2014-10-01 18:56:50 +00:00
Zoltan Szatmary-Ban
b5550a65c0 am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 
* commit '45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
  Disambiguate categories in Settings > Trusted Credentials
 2014-10-01 17:20:47 +00:00
Zoltan Szatmary-Ban
45f8ffa1da am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 
* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
  Disambiguate categories in Settings > Trusted Credentials
 2014-10-01 17:02:07 +00:00
Zoltan Szatmary-Ban
b0c216d3b9 Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 2014-10-01 15:48:00 +00:00
Maurice Lam
a1ecc44fa8 am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev 
* commit '492f87288699dbf8bb521c4160688b73d241d454':
  [WifiSetup] Update background texture
 2014-10-01 15:19:17 +00:00
Svetoslav
7358b7d562 am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit 'e78840ff097dd09c24977876e2f84972dbe1361b':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:19:16 +00:00
Fabrice Di Meglio
3d2441f776 am 3cc8fe3b: am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev 
* commit '3cc8fe3bcc9aad32a0740ccf4a4c23cee537deba':
  Update Settings App icons
 2014-10-01 15:19:15 +00:00
PauloftheWest
cd93da0235 am 8506c378: am cc6736bf: am 29aab7a2: Fixed a Settings crash. 
* commit '8506c378975c687f8658b6dbe13f41e69599832c':
  Fixed a Settings crash.
 2014-10-01 15:19:14 +00:00
Maurice Lam
492f872886 am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev 
* commit '5fdb8fa41d44fe31148f00b6c909f511f11fde52':
  [WifiSetup] Update background texture
 2014-10-01 15:09:26 +00:00
Svetoslav
e78840ff09 am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit '42eff3b7e695c28c4074f7fd71606fa0ecfe199c':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:09:25 +00:00
Fabrice Di Meglio
3cc8fe3bcc am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev 
* commit '976aba99c8b06676b9e097de74287bb70138c848':
  Update Settings App icons
 2014-10-01 15:09:24 +00:00
PauloftheWest
8506c37897 am cc6736bf: am 29aab7a2: Fixed a Settings crash. 
* commit 'cc6736bfdee735c236814488a169ee5a7c461f73':
  Fixed a Settings crash.
 2014-10-01 15:09:24 +00:00
Maurice Lam
5fdb8fa41d am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev 
* commit 'f7b567081ef5f4daafdf0b229793323751e0d764':
  [WifiSetup] Update background texture
 2014-10-01 15:03:19 +00:00
Svetoslav
42eff3b7e6 am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit '524484426855f814ff1f3189fd5221dd630dbf8c':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:02:20 +00:00
Fabrice Di Meglio
976aba99c8 am fc14e272: Merge "Update Settings App icons" into lmp-dev 
* commit 'fc14e272aaed6a6e36c044b93e12d68896aaa543':
  Update Settings App icons
 2014-10-01 15:00:30 +00:00
PauloftheWest
cc6736bfde am 29aab7a2: Fixed a Settings crash. 
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
  Fixed a Settings crash.
 2014-10-01 14:58:41 +00:00
Maurice Lam
f7b567081e Merge "[WifiSetup] Update background texture" into lmp-dev 2014-10-01 01:54:41 +00:00
Maurice Lam
1e055e8f43 [WifiSetup] Update background texture 
Bug: 17611097
Change-Id: I75264ecac3b689426500e063a18d687866638a85
 2014-09-30 17:09:11 -07:00
Svetoslav
5244844268 Use default encryption password if an accessibility service is enabled. 
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.

bug:17671790

Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
 2014-09-30 23:03:37 +00:00
Baligh Uddin
424bc849bb Import translations. DO NOT MERGE 
Change-Id: Id1d79b0917bd6e59425a959a3038fd05e1490c18
Auto-generated-cl: translation import
 2014-09-30 13:18:06 -07:00
Baligh Uddin
92a808f0bb Import translations. DO NOT MERGE 
Change-Id: I43fa57825b6b23b06740ec46d0af3f43ce041fec
Auto-generated-cl: translation import
 2014-09-30 12:55:13 -07:00
Fabrice Di Meglio
fc14e272aa Merge "Update Settings App icons" into lmp-dev 2014-09-30 19:45:31 +00:00
Zoltan Szatmary-Ban
af0f89ff91 Disambiguate categories in Settings > Trusted Credentials 
Use fixed category names (e.g. 'Personal' and 'Work') on Trusted Credentials
screen instead of names of profiles that may be the same (or similar) for both.

Bug: 17629895
Change-Id: I25b39310f7b9f445d2724be046a16cc82f5d1a9a
 2014-09-30 16:30:07 +01:00
Fabrice Di Meglio
85f76f3a7d Update Settings App icons 
Per UX request

See bug: #17703962 update Settings app icons

Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a
 2014-09-29 19:17:56 -07:00
PauloftheWest
29aab7a2ad Fixed a Settings crash. 
+ When in Settings->More... we will no longer provide a tethering option
if tethering requires provisioning, but the provisioning app is invalid.

Bug: 17671381
Change-Id: I48a8178865a7ffddec714c1f6ee6f18d34801b60
 2014-09-29 14:58:27 -07:00
Baligh Uddin
91b315c1d6 am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '02e6f6115bfa5f9652560cf5a58827ed6c4b43fb':
  Import translations. DO NOT MERGE
 2014-09-29 21:00:28 +00:00
PauloftheWest
db46469432 am c4ef9bf8: am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit 'c4ef9bf82440764609356b3364e066a4b35a0114':
  Fixed multiple MAP issues.
 2014-09-29 21:00:27 +00:00
Baligh Uddin
02e6f6115b am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6cbdf17e7b8244601174295d2ddeb333c073cfc4':
  Import translations. DO NOT MERGE
 2014-09-29 20:50:31 +00:00
PauloftheWest
c4ef9bf824 am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit 'dc5f87fffceac79169fe546055f2ecc3a4142bfe':
  Fixed multiple MAP issues.
 2014-09-29 20:50:30 +00:00
Baligh Uddin
6cbdf17e7b am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
  Import translations. DO NOT MERGE
 2014-09-29 20:41:53 +00:00
PauloftheWest
dc5f87fffc am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev 
* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
  Fixed multiple MAP issues.
 2014-09-29 20:41:53 +00:00
Robert Greenwalt
0f3eb7b287 am a3c7a104: am 42dd9335: am 20371b52: am 613620df: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev 
* commit 'a3c7a104b353bc67a4de6bc9ec391de0c1c9372f':
  ATT Entitlement changes in Settings to pass Tether Type.
 2014-09-29 19:44:57 +00:00
Elliott Hughes
8d8aa7b5a2 am 00d038df: am 100bed71: am 38c42ec1: am 66392541: am ed6a6ca0: Make the system locale available to the decryption UI. 
* commit '00d038df28adebf3d9d70d0afc101b17c15ee3d0':
  Make the system locale available to the decryption UI.
 2014-09-29 19:44:47 +00:00