Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,225 Commits 1 Branch 0 Tags
3dc6c4e6f310ddfca53730ee4aafe201224ed78b
Commit Graph

18225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
3dc6c4e6f3 am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a':
  Adding Sim Status menu to Settings.
 2014-11-14 00:43:19 +00:00
PauloftheWest
f95f2590c1 am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit '0f4254fab38fc7b47e4532446dd13338aa4c2cf0':
  Adding Sim Status menu to Settings.
 2014-11-13 15:15:46 +00:00
PauloftheWest
0f4254fab3 am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit '26104298eb53d2dfa693eec32934f9ac0aa3d525':
  Adding Sim Status menu to Settings.
 2014-11-13 15:08:03 +00:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +00:00
Geoff Mendal
a34d65ae20 am 22ab79dd: (-s ours) am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '22ab79dd47e882fc3e7417fa148da89234b0ad35':
  Import translations. DO NOT MERGE
 2014-11-13 02:15:55 +00:00
Sanket Padawe
6d795b9161 am 2856fb31: am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit '2856fb31e8b573b54f8064941795efcd8a9324bd':
  UI changes for icons in sim settings
 2014-11-13 02:13:26 +00:00
Geoff Mendal
c442da4f7e am b05537c0: (-s ours) am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit 'b05537c0ae85b43c7497f8b1dd1bda9f910707d9':
  Import translations. DO NOT MERGE
 2014-11-13 02:13:25 +00:00
Geoff Mendal
22ab79dd47 am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '28408035173a5e15f6ccc119bc61127cfd989f0c':
  Import translations. DO NOT MERGE
 2014-11-13 00:00:37 +00:00
Sanket Padawe
2856fb31e8 am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit 'f722ff93fc2c2e6799970a29e59d5db0a152b1e4':
  UI changes for icons in sim settings
 2014-11-12 23:50:34 +00:00
Geoff Mendal
b05537c0ae am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit '1503406487bb2f0412fce00c83533093006b04d7':
  Import translations. DO NOT MERGE
 2014-11-12 23:50:33 +00:00
Geoff Mendal
2840803517 am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c5079a06dc2f57718cd781ae855b687a14cc1c2f':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:23 +00:00
Geoff Mendal
c5079a06dc am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '827ad0c38c76b932237fc22ecfcb35bff8de148f':
  Import translations. DO NOT MERGE
 2014-11-12 23:34:27 +00:00
Geoff Mendal
827ad0c38c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:30:10 +00:00
PauloftheWest
76b0801173 Adding Sim Status menu to Settings. 
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417)

Bug: 18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
 2014-11-12 14:52:18 -08:00
Geoff Mendal
c9e7209ca8 Import translations. DO NOT MERGE 
Change-Id: I99007a120d90a442a65f31ab35b8da3d1aa8524e
Auto-generated-cl: translation import
 2014-11-12 14:48:49 -08:00
Sanket Padawe
f722ff93fc am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit '6416bec01de67492ac761ba84c8b86c59e4dee28':
  UI changes for icons in sim settings
 2014-11-12 22:46:03 +00:00
Geoff Mendal
1503406487 am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit 'fbce961b80d731e6eb473de4c1ae5e683bed5566':
  Import translations. DO NOT MERGE
 2014-11-12 22:45:59 +00:00
Sanket Padawe
6416bec01d Merge "UI changes for icons in sim settings" into lmp-mr1-dev 2014-11-12 22:08:53 +00:00
Geoff Mendal
fbce961b80 am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit '9ae3bf2d3fca27966328e68263880080a1bdd79e':
  Import translations. DO NOT MERGE
 2014-11-12 22:04:57 +00:00
Sanket Padawe
0381f6c675 UI changes for icons in sim settings 
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog

Bug: 18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
 2014-11-12 12:41:35 -08:00
Geoff Mendal
9ae3bf2d3f Import translations. DO NOT MERGE 
Change-Id: I8170fefa7733e2feddad643069cc0407631a2b96
Auto-generated-cl: translation import
 2014-11-12 12:07:20 -08:00
Geoff Mendal
6020c72618 am 6065a571: (-s ours) am 7897993b: (-s ours) am cdbba048: (-s ours) Import translations. DO NOT MERGE 
* commit '6065a571acd38872225fda398345eae594ea2fbe':
  Import translations. DO NOT MERGE
 2014-11-12 18:32:27 +00:00
Geoff Mendal
c28e2544c3 am 37b06e06: (-s ours) am a1486acf: (-s ours) Import translations. DO NOT MERGE 
* commit '37b06e06dd3257b7e6b1c892dace4b4cdce0d9e2':
  Import translations. DO NOT MERGE
 2014-11-12 18:32:26 +00:00
Geoff Mendal
6065a571ac am 7897993b: (-s ours) am cdbba048: (-s ours) Import translations. DO NOT MERGE 
* commit '7897993b6175d605dcf6d3318388005ea693ad4a':
  Import translations. DO NOT MERGE
 2014-11-12 18:25:16 +00:00
Geoff Mendal
37b06e06dd am a1486acf: (-s ours) Import translations. DO NOT MERGE 
* commit 'a1486acfeff910751b255b597383e5465670cdf0':
  Import translations. DO NOT MERGE
 2014-11-12 18:25:15 +00:00
Geoff Mendal
7897993b61 am cdbba048: (-s ours) Import translations. DO NOT MERGE 
* commit 'cdbba0489bec3a889c457312183ab9ab855cfc51':
  Import translations. DO NOT MERGE
 2014-11-12 18:23:10 +00:00
Geoff Mendal
5bd9c01b43 Import translations. DO NOT MERGE 
Change-Id: I71de5d728294ddcf9a6ae0ddb6d5682d1b03e955
Auto-generated-cl: translation import
 2014-11-12 10:05:24 -08:00
Geoff Mendal
a1486acfef Import translations. DO NOT MERGE 
Change-Id: Id80c19a2c80275ea0c63e12d23761e5bed47f0b8
Auto-generated-cl: translation import
 2014-11-12 09:53:14 -08:00
Geoff Mendal
cdbba0489b Import translations. DO NOT MERGE 
Change-Id: I628e96983ed2224fb17081a509a7de379b89b88b
Auto-generated-cl: translation import
 2014-11-12 09:48:33 -08:00
vandwalle
45e7a93e95 am bf1dcec1: Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 53ad50b automerge: 4f2c003 
* commit 'bf1dcec15f95ce785b78a0657fd601879f1b1135':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 03:45:33 +00:00
Wink Saville
4bd0064b3b am 324cabb2: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 588611e automerge: 754da43 
* commit '324cabb2d87e9209f0031bad2ce99929ba627dc5':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:45:32 +00:00
Amith Yamasani
5427d133f7 am db0e866d: Fix a regression in enabling unknown sources toggle automerge: ceceb2a automerge: 8b955d1 
* commit 'db0e866d578caab58d22e192d28cf76e18e2f8f1':
  Fix a regression in enabling unknown sources toggle
 2014-11-12 03:44:35 +00:00
vandwalle
bf1dcec15f Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 53ad50b 
automerge: 4f2c003

* commit '4f2c003d6ae0db4b6d929e2de5e40d7ab01a76dc':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 03:24:47 +00:00
Wink Saville
324cabb2d8 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 588611e 
automerge: 754da43

* commit '754da436c9ccae525af19a590533307f0ec9c6c5':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:23:15 +00:00
Amith Yamasani
db0e866d57 Fix a regression in enabling unknown sources toggle automerge: ceceb2a 
automerge: 8b955d1

* commit '8b955d1d47e1bcf1e989fb437f50dd7f82f1e567':
  Fix a regression in enabling unknown sources toggle
 2014-11-12 03:12:40 +00:00
Alexandra Gherghina
02eb4a1481 am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev automerge: 5fc5de1 
automerge: 0c0b8a6

* commit '0c0b8a62ecabd8b44b3a921891e97125dcda50ee':
  Reorganize sync state menu options for accounts settings
 2014-11-12 02:47:11 +00:00
vandwalle
4f2c003d6a Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 
automerge: 53ad50b

* commit '53ad50b05bd95157c1b0bcefe321b2a561dc2696':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 02:25:43 +00:00
Wink Saville
754da436c9 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 588611e

* commit '588611eea55ee3ef617d17ea89c16174935a6a1a':
  Update SubscriptionManager API as per API council.
 2014-11-12 02:24:06 +00:00
vandwalle
53ad50b05b Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:38 +00:00
Amith Yamasani
8b955d1d47 Fix a regression in enabling unknown sources toggle 
automerge: ceceb2a

* commit 'ceceb2ab07aab457a4229d051de222ad88ed62a1':
  Fix a regression in enabling unknown sources toggle
 2014-11-12 01:13:42 +00:00
Wink Saville
588611eea5 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:27 +00:00
Alexandra Gherghina
0c0b8a62ec am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 
automerge: 5fc5de1

* commit '5fc5de1f6acdc255ae1f9b21380fe8adad791080':
  Reorganize sync state menu options for accounts settings
 2014-11-12 00:25:54 +00:00
Amith Yamasani
ceceb2ab07 Fix a regression in enabling unknown sources toggle 
In Security Settings, allow unknown sources to be
toggled for primary and secondary users unless it
is a restricted profile or there is a device policy
restriction to disallow installing apps or installing
from unknown sources.

Bug: 18277370
Change-Id: I9f0b6cd603c4c8deb77d36af1b82cace43ba195f
 2014-11-11 23:39:58 +00:00
Alexandra Gherghina
5fc5de1f6a am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 
* commit 'aa762831729e7c91c10184f11b978bd501b94e71':
  Reorganize sync state menu options for accounts settings
 2014-11-11 22:48:25 +00:00
Alexandra Gherghina
aa76283172 Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 2014-11-11 22:27:47 +00:00
John Spurlock
5f0d6e2b77 am 32830286: am 0193911e: Settings: Tweak doze settings description. automerge: 9259316 
* commit '32830286e83f26af871785741a65d18c0c5f5058':
  Settings: Tweak doze settings description.
 2014-11-11 18:55:37 +00:00
John Spurlock
32830286e8 am 0193911e: Settings: Tweak doze settings description. 
automerge: 9259316

* commit '925931601d48a0cdec885f1a381339f78c282bcf':
  Settings: Tweak doze settings description.
 2014-11-11 18:51:45 +00:00
John Spurlock
925931601d am 0193911e: Settings: Tweak doze settings description. 
* commit '0193911ea5a81e772a3d07e62af768559c36f1d5':
  Settings: Tweak doze settings description.
 2014-11-11 18:18:20 +00:00
John Spurlock
0193911ea5 Settings: Tweak doze settings description. 
Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759
 2014-11-11 13:07:09 -05:00
Wink Saville
ca7566125e Update SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
 2014-11-11 07:06:03 -08:00