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
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
2014-11-12 03:23:15 +00:00
Amith Yamasani
db0e866d57
Fix a regression in enabling unknown sources toggle automerge: ceceb2a
...
automerge: 8b955d1
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
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
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
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
Zoltan Szatmary-Ban
7cc1b9e63e
Show managed profile accounts on Settings > Factory Reset
...
List both primary profile's and managed profile's accounts. Also notify the user
if there are other users present on the device.
Bug: 17899181
Change-Id: I5401722e65305861edeed60cfe926fca5c81a418
2014-11-12 01:18:29 +00:00
Amith Yamasani
8b955d1d47
Fix a regression in enabling unknown sources toggle
...
automerge: ceceb2a
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
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
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
Alexandra Gherghina
b2d9795cda
Reorganize sync state menu options for accounts settings
...
Fixes inverted condition for displaying the buttons, updates
at the right time and removes the useless dependence on mFirstAccount
Bug: 18310988
Change-Id: Id55e11a210aa58a10ee9613891470862d42b65ad
2014-11-11 14:36:09 +00:00
John Spurlock
db73eae8d9
am 1f382c6a: Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b automerge: 28c275e
...
* commit '1f382c6a4fece4de542996adb27054088784503c':
Settings: Update preference summary per new downtime behavior.
2014-11-11 02:50:24 +00:00
John Spurlock
1f382c6a4f
Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b
...
automerge: 28c275e
2014-11-11 02:43:47 +00:00
John Spurlock
28c275ed70
Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev
...
automerge: 64cb79b
2014-11-11 02:33:20 +00:00
John Spurlock
64cb79bb69
Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev
2014-11-11 02:22:19 +00:00
Fabrice Di Meglio
601d38efac
am a50e78ca: am 668b0e27: am ded5a85a: Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev
...
* commit 'a50e78ca913c8525c46cb104581eb0e23a2e297f':
Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
2014-11-11 01:03:13 +00:00
Fabrice Di Meglio
a50e78ca91
am 668b0e27: am ded5a85a: Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev
...
* commit '668b0e2756b98dc8c2096586c342c1ffa1eb5bbb':
Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
2014-11-11 00:59:27 +00:00
Geoff Mendal
0e2bf443c1
am bb1e76b1: (-s ours) am 13da7679: (-s ours) am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bb1e76b11ea9fda94e548897a1970956144f29e1':
Import translations. DO NOT MERGE
2014-11-11 00:54:42 +00:00
Fabrice Di Meglio
668b0e2756
am ded5a85a: Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev
...
* commit 'ded5a85aad2262d71fead6533901eee96abf9378':
Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
2014-11-11 00:52:49 +00:00
Geoff Mendal
bb1e76b11e
am 13da7679: (-s ours) am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE
...
* commit '13da7679407ad0a69e7f055689b3e502864697f2':
Import translations. DO NOT MERGE
2014-11-11 00:51:02 +00:00
Fabrice Di Meglio
ded5a85aad
Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev
2014-11-11 00:48:19 +00:00
Geoff Mendal
13da767940
am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE
...
* commit '61fe962f9072dffd6ebbe9be2870b55ddd9617c5':
Import translations. DO NOT MERGE
2014-11-11 00:47:47 +00:00
