PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,894 Commits 1 Branch 0 Tags
942edf4ca6fb2e191d2ba1f5f2c2933c535516fd
Commit Graph

7473 Commits

Author SHA1 Message Date
Svetoslav
942edf4ca6 am 21824675: am 6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev 
* commit '21824675d5343f26fd0c4cda45d60be89d59c59b':
  Settings not showing print jobs for a managed profile.
 2015-01-15 05:04:51 +00:00
Svetoslav
6491d51fdc Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev 2015-01-15 04:47:54 +00:00
Sanket Padawe
56b16015bc am 872ed290: am b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 
* commit '872ed290de26374bb1ce9a2e43b0f75c79125ee6':
  Fixed missing sim card lock setup in Security Settings.
 2015-01-15 00:42:24 +00:00
Sanket Padawe
2c19066e00 am 0f9db227: am e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 
* commit '0f9db227ec110e9344f9d4f96ff983780531eb76':
  Fixed data connection toggle UI issue due to local cache maintained.
 2015-01-15 00:42:23 +00:00
Sanket Padawe
b57e1f2964 Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 2015-01-14 23:20:05 +00:00
Sanket Padawe
e79b65d6c6 Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 2015-01-14 23:18:13 +00:00
Sanket Padawe
247842017e Fixed missing sim card lock setup in Security Settings. 
Bug: 19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
 2015-01-14 14:48:27 -08:00
Sanket Padawe
d819270f0f Fixed data connection toggle UI issue due to local cache maintained. 
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.

Bug: 18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
 2015-01-14 11:03:33 -08:00
Lucky Zhang
591a091311 am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 
* commit '585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
  [Settings] Wifi Setup responds to other connection state change
 2015-01-14 12:06:43 +00:00
Svetoslav
6cfe799654 Settings not showing print jobs for a managed profile. 
The settings app is shared among the personal and work profiles.
When fetching print jobs it was not getting the ones for the work
profile, rather the ones for the current user which is the personal
profile.

bug:18867406

Change-Id: I99f8cf3a3e2b133a0a4d5a8915473d1190e205f4
 2015-01-13 18:48:33 -08:00
Lucky Zhang
0325a85849 Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 2015-01-14 01:36:45 +00:00
Lucky Zhang
9fe89bbb2e [Settings] Wifi Setup responds to other connection state change 
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291).

Added logic to update the next ("skip") button state accordingly:

(1) "Skip" button should be enabled if
    - wifi is not required and network is not required
    - or wifi is not required, but network is required, and we have a
      valid network connection

(2) "Skip" button should be disabled if
    - wifi is required
    - or wifi is not required, but network is required, and we have
      no valid network connection

Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.

This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.

Bug: 18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
 2015-01-13 17:20:42 -08:00
Wink Saville
1015f08455 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener. 
* commit 'a908d8191acf3e4786933d67a1a4211543323a7d':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:16:05 +00:00
Wink Saville
718c4d9b19 Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:25 -08:00
Sanket Padawe
dd0a5db0dd am 058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge: 270af42 
* commit '058b0561b3712f19aba28020dad3cd63762050f5':
  Display Voice nw type if Data nw is Unknown for Sprout.
 2015-01-09 19:17:18 +00:00
Sanket Padawe
270af427cd Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev 2015-01-09 19:08:26 +00:00
Sanket Padawe
c7e5b42ac4 am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 
* commit '0c3b13718defb18191120c578c1658c26c4d13e0':
  Fixed Cellular data toggling issue in settings for multisim
 2015-01-08 23:19:38 +00:00
Sanket Padawe
f5a4abc205 Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 2015-01-08 23:09:11 +00:00
Sanket Padawe
4201391899 Display Voice nw type if Data nw is Unknown for Sprout. 
For multisim device when default data connection is set to 1st sim,
getDataNetworkType() returns Unknown for 2nd sim. In that case use
getVoiceNetworkType() to display Cellular nw type in sim status.

Bug: 18922147
Change-Id: Id7c39f8717737b60bde988cbd1c85ce8f6768a6f
 2015-01-08 12:37:34 -08:00
Sanket Padawe
24f834d745 Fixed Cellular data toggling issue in settings for multisim 
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
 2015-01-08 11:23:11 -08:00
Benjamin Franz
cc18d7393b am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535 
* commit 'd8e53f271f1aa90f92d239f48120ffc6c5b87055':
  Block BluetoothPermissionRequest notification on managed profiles.
 2015-01-08 17:49:11 +00:00
Benjamin Franz
ceee535c65 Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 2015-01-08 17:40:09 +00:00
Andres Morales
dfb448d23e am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev 
* commit 'f58a646bc01cc8d416d5babae2d06dad5018cc6d':
  Don't display Write NFC option if no NFC
 2015-01-07 16:31:57 +00:00
Andres Morales
f11feccf99 Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev 2015-01-07 16:21:48 +00:00
Mikhail Naganov
8ada2c53b9 am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev 
* commit '2399c4500c5801cead4ce89132751fd21551213a':
  Add an item to "Legal information" screen for WebView license
 2015-01-07 12:50:04 +00:00
Zoltan Szatmary-Ban
c374175f61 am d4e7dcb9: am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev 
* commit 'd4e7dcb9d55ae5d5c0196f6e77c05a8d02698e16':
  Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
 2015-01-07 12:50:02 +00:00
Mikhail Naganov
59f4d20b2e Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev 2015-01-07 12:33:30 +00:00
Zoltan Szatmary-Ban
15e2c54a2f Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev 2015-01-07 12:31:57 +00:00
Sanket Padawe
310b533689 am 2c9d75a7: am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev 
* commit '2c9d75a7c379c07bf84bfc87cbe4d1a4666bfc47':
  Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
 2015-01-06 20:56:36 +00:00
Mikhail Naganov
71ef80eaf4 Add an item to "Legal information" screen for WebView license 
Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.

Bug: 18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
 2015-01-06 20:55:09 +00:00
Sanket Padawe
4d902bcc8f Fixed crash caused by non-integer phoneAccountId in SimDialogActivity. 
Bug: 18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
 2015-01-06 10:54:55 -08:00
Andres Morales
64c7429ac8 Don't display Write NFC option if no NFC 
Bug: 18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
 2015-01-06 09:38:53 -08:00
Zoltan Szatmary-Ban
fb1bdf0ffc Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials 
Remove the enable/disable button in certificate setting dialog if restriction
has been put on the respective profile. Also catch security exception just in
case.

Bug: 18899182
Change-Id: Ia247ab264c1b2d08b58456519bf471ba8c727745
 2015-01-05 16:49:53 +00:00
Benjamin Franz
0fe3ed5ab5 Block BluetoothPermissionRequest notification on managed profiles. 
This notification is triggered when a bluetooth device that supports
the PBAP protocol. On managed profiles this functionality is not yet
available and therefore the notification and resulting acvitivity
have no function.

Bug: 18782769
Change-Id: Iaea12eee8ec4727d9448f690861f8344e2296028
 2015-01-02 12:54:01 +00:00
Prem Kumar
5aebac31e8 am 70c4a7b1: am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev 
* commit '70c4a7b145c4949761e0f13642c535d1bf3c810e':
  SIM Status now shows data connection instead of voice.
 2014-12-29 17:24:52 +00:00
Prem Kumar
531127a5c2 Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev 2014-12-29 13:23:51 +00:00
Sanket Padawe
d1724df602 am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev 
automerge: f128cff

* commit 'f128cff21ef7b8e2fa7721b481477ffecd9244ab':
  Fixed settings crash issue while recovering from phone crash.
 2014-12-28 05:31:57 +00:00
Sanket Padawe
9b1383a46d Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev 2014-12-23 03:35:23 +00:00
Sanket Padawe
79d5da7bf6 Fixed settings crash issue while recovering from phone crash. 
Bug: 18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
 2014-12-22 10:33:49 -08:00
PauloftheWest
68b93e68e2 am 1a5d132f: am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev 
* commit '1a5d132fcbf6a00c500fb7031a1f15e0328e7dcb':
  Removed extraneous slot information on single SIM devices.
 2014-12-19 23:03:11 +00:00
PauloftheWest
3e864c0bda Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev 2014-12-19 22:53:03 +00:00
PauloftheWest
a68bdb6dbe Removed extraneous slot information on single SIM devices. 
Bug: 18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
 2014-12-18 15:02:39 -08:00
PauloftheWest
58f7eaf3d2 SIM Status now shows data connection instead of voice. 
Bug: 18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
 2014-12-18 13:59:04 -08:00
Sanket Padawe
ec3f7998db am eec0c11a: am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord. 
* commit 'eec0c11ae3386284dd6797076764572efeca52c3':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 18:43:55 +00:00
Sanket Padawe
19627ca215 Getting mcc/mnc from system prop instead of subInfoRecord. 
Bug: 18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
 2014-12-18 10:29:16 -08:00
Sanket Padawe
25f2cfe94e am 72cedc7a: am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev 
* commit '72cedc7af53483dea41eb391613b94b6f0a7226e':
  Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
 2014-12-18 06:38:28 +00:00
Sanket Padawe
4be06d9c48 Revert "Getting mcc/mnc from system prop instead of subInfoRecord." 
This reverts commit 579b66f28d.

Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
 2014-12-18 06:24:36 +00:00
Sanket Padawe
2497b44ab0 am cff282f3: am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev 
* commit 'cff282f3fc81c401a873cdf87ff399b8be28f90b':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 05:04:12 +00:00
Sanket Padawe
579b66f28d Getting mcc/mnc from system prop instead of subInfoRecord. 
Bug: 18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
 2014-12-17 19:31:30 -08:00
Jason Monk
c0ecaeefe8 am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 
* commit '5aaa4b63bd6ee0639ee067e3287e5d97b692a444':
  Add a periodic check of the tethering provisioning
 2014-12-16 17:05:14 +00:00