PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,418 Commits 1 Branch 0 Tags
33acb15e032ac65d743b708731004b9a5f7813d5
Commit Graph

7845 Commits

Author SHA1 Message Date
Amith Yamasani
32505ac699 Don't show SMS app settings for restricted profiles 
Restricted profiles might not have an SMS app and there is
currently no UI to enable/disable SMS for restricted profiles. SMS
is disabled by default in this case. So hide the SMS app picker
option in restricted profiles.

Bug: 17521457
Change-Id: Id2bb3e4690a4afba75ebcec8531727ec150c5632
 2014-11-12 15:35:17 -08: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
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
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
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
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
Wink Saville
588611eea5 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:27 +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
aa76283172 Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 2014-11-11 22:27:47 +00: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
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
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
Fabrice Di Meglio
c66a878813 Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button 
- prevent sending onRadioButtonClicked() if the radio button is already checked
- check the new current radio button

Change-Id: I7e4457bcba6eb1abf51fbe3902bc0f6df0f4bdcf
 2014-11-10 16:35:06 -08:00
John Spurlock
49300d19ab Settings: Update preference summary per new downtime behavior. 
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
 2014-11-10 14:49:10 -05:00
Jeff Davidson
f9c285896c am a8b154f2: am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 
* commit 'a8b154f2f04c6130a65c0b45947e01a896e47cd9':
  Don't allow secondary users to change Wi-Fi assistants.
 2014-11-10 17:50:08 +00:00
Jeff Davidson
76f0133831 Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 2014-11-10 17:35:29 +00:00
Alexandra Gherghina
513b2cb97e am ac62d700: am ba1eba04: am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 
* commit 'ac62d70080140b8068e93ba43d3de167f5ac16d2':
  Update sync state immediately after accounts are shown
 2014-11-10 10:28:47 +00:00
Alexandra Gherghina
095521b287 Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 2014-11-10 10:13:00 +00:00
Paul Crowley
74d7841f24 am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f 
automerge: 2e6a170

* commit '2e6a170aa579a05b120d5b8c6d56250bbed54674':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-08 13:58:42 +00:00
Paul Crowley
6bd45c0eba am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35 
automerge: 0475a3c

* commit '0475a3ccc508b0c61b23733f0ec27110910e21b2':
  Use the right message for pattern/password.
 2014-11-08 03:18:47 +00:00
vandwalle
8be7ee3aac dont blacklist wifi config that have had validated internet status in the past 
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
 2014-11-07 19:01:58 -08:00
Paul Crowley
2555e5f104 Prevent factory reset for short passwords in CryptKeeper 
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java
 2014-11-08 01:43:45 +00:00
Paul Crowley
c44ad35e51 Merge "Use the right message for pattern/password." into lmp-mr1-dev 2014-11-08 01:13:11 +00:00
Stuart Scott
928052ebe8 am 48471e39: am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev 
* commit '48471e397e6e63a72e0ff80df5bba9700d6f9cba':
  Update SubInfoRecord usage
 2014-11-08 00:25:17 +00:00
Paul Crowley
a8c760691d Use the right message for pattern/password. 
Bug: 17875087
Change-Id: I7729a4fcb993def912e950ad0ea59fd64bfc34d3
 2014-11-07 23:54:56 +00:00
Stuart Scott
4d1a0165b4 Update SubInfoRecord usage 
bug: 17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
 2014-11-07 23:53:56 +00:00
PauloftheWest
2d17937e10 am cd16c4bb: am 7be19184: am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 
* commit 'cd16c4bb0404b4e2e90ac3f802b4fc71e55055a4':
  Migrated search for SubInfoRecord to Utils.
 2014-11-07 22:48:04 +00:00
PauloftheWest
5aafdda85c Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 2014-11-07 22:28:47 +00:00
PauloftheWest
0a0dacaf17 Migrated search for SubInfoRecord to Utils. 
Bug: 18293625
Bug: 18293168
Bug: 18291246
Change-Id: Iad01a01d9b60ca010943447b00c1394471e93d5a
 2014-11-07 14:26:22 -08:00
Jeff Davidson
739ae972d0 Don't allow secondary users to change Wi-Fi assistants. 
This is not ideal but better than the current situation given that the
rest of the connectivity stack does not properly support multi-user.

Bug: 17320659
Change-Id: Ia0d4c746b4ebe6ce90df7ff39f0398ca78fd61f6
 2014-11-07 13:26:56 -08:00
Sanket Padawe
4f8844057f am a66826e3: am 80b7a2e4: am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 
* commit 'a66826e387d158ac9e018aab0d82782377269756':
  Set default sim name and carrier name from subinforecord object.
 2014-11-07 20:09:38 +00:00
Sanket Padawe
b58119b709 Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 2014-11-07 19:47:45 +00:00
Fabrice Di Meglio
5540ed56a3 am fbacdbdc: am 330fc418: am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 
* commit 'fbacdbdc5f2aba513782ce2879d0e3ebef5f966b':
  Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
 2014-11-07 19:34:26 +00:00
Fabrice Di Meglio
d4006a4cbf am e8b40c95: am d762aaab: am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 
* commit 'e8b40c950bc76ab175f3eccff73543d891301a4c':
  Fix bug #17936169 subsettings activity crashes on emulator for android-21
 2014-11-07 19:34:25 +00:00
Fabrice Di Meglio
293d974482 Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 2014-11-07 19:14:04 +00:00
Fabrice Di Meglio
2a4f034da4 Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 2014-11-07 19:13:27 +00:00
Sanket Padawe
d21b45e01c Set default sim name and carrier name from subinforecord object. 
Changes for retrieving display name and carrier name from subinforecord
object.

Bug: 18247211
Bug: 17732079
Bug: 17321641
Change-Id: I718700648ddd5a2646c720591ce776bd30a03543

Conflicts:
	src/com/android/settings/sim/SimSettings.java
 2014-11-07 18:06:49 +00:00
Alexandra Gherghina
6002ff8dce Update sync state immediately after accounts are shown 
Bug: 18251114
Change-Id: I13791ff3979ce862e11989a3819f2356be32a0f4
 2014-11-07 15:24:28 +00:00
Alexandra Gherghina
b057bd73ca am bea0f7f9: am a4a7b739: am c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 
* commit 'bea0f7f9a0043b9a5b93a7fa1615d332a61dd7e3':
  Disable app notifications checkbox for uninstalled apps
 2014-11-07 10:48:44 +00:00
Alexandra Gherghina
c66eb698a9 Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 2014-11-07 10:35:53 +00:00
Alexandra Gherghina
51ea7cf4dc Disable app notifications checkbox for uninstalled apps 
Bug: 18253810
Change-Id: I99fb2ae34b16944fd839db4e7c380b2d32f3b85d
 2014-11-07 10:05:59 +00:00
Fabrice Di Meglio
d103e453c6 am 981ab4b2: am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit '981ab4b2f194c52f4401b3c6e55fb9549204e051':
  Update synonyms and fix some issues related to them
 2014-11-07 04:17:46 +00:00
Paul Crowley
a03cd588d2 am 0844554f: am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev 
* commit '0844554f82b0db64cb2eeb8f0aac681edb7ad6f6':
  Add a new flow for decryption checking.
 2014-11-07 04:15:35 +00:00
Jeff Davidson
568d156089 am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card. 
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.
 2014-11-07 04:12:59 +00:00