PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,876 Commits 1 Branch 0 Tags
591a09131162a32ad5923dc3553a464a5da1d39c
Commit Graph

17876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lucky Zhang
585b53e6d2 am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 
* commit '0325a85849ab7d08555e8ce1d95d6d239d41ef27':
  [Settings] Wifi Setup responds to other connection state change
 2015-01-14 11:59:54 +00: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
bcad54f647 am cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 
* commit 'cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4':
 2015-01-13 19:16:06 +00: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
cc26e1dc5c Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 2015-01-13 19:10:40 +00:00
Wink Saville
28bb4cda83 Rename reg/unreg OnSubscriptionsChangedListener. 
automerge: 718c4d9

* commit '718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:54 +00:00
Wink Saville
a908d8191a am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener. 
* commit '718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:51 +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
Geoff Mendal
4d23238631 am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE 
* commit '4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
  Import translations. DO NOT MERGE
 2015-01-12 16:40:27 +00:00
Geoff Mendal
4fe6117cc1 am 26310772: (-s ours) Import translations. DO NOT MERGE 
* commit '26310772872b327029cad560fa7b3e797b7980e9':
  Import translations. DO NOT MERGE
 2015-01-12 16:14:28 +00:00
Geoff Mendal
3f2ece6cea am 04250824: (-s ours) Import translations. DO NOT MERGE 
* commit '04250824ff4d5231ee17a060a7ce77fcc02a6657':
  Import translations. DO NOT MERGE
 2015-01-12 16:14:25 +00:00
Geoff Mendal
04250824ff Import translations. DO NOT MERGE 
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
 2015-01-12 07:03:11 -08:00
Geoff Mendal
2631077287 Import translations. DO NOT MERGE 
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
 2015-01-12 06:55:33 -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
058b0561b3 Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev 
automerge: 270af42

* commit '270af427cd509b002751d6e6243a02f6c199b1a0':
  Display Voice nw type if Data nw is Unknown for Sprout.
 2015-01-09 19:11:35 +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
0c3b13718d am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 
* commit 'f5a4abc2057f1e2d242f95e5251e563cff7c9da4':
  Fixed Cellular data toggling issue in settings for multisim
 2015-01-08 23:15:10 +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
d8e53f271f Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 
automerge: ceee535

* commit 'ceee535c6533cd5ba047ede780ca9c089b84fb9f':
  Block BluetoothPermissionRequest notification on managed profiles.
 2015-01-08 17:43:02 +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
f58a646bc0 am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev 
* commit 'f11feccf99948d166e6873315252fdaf416ae272':
  Don't display Write NFC option if no NFC
 2015-01-07 16:26:19 +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
Geoff Mendal
634b17063b am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE 
* commit '0347196c6992e490be74c2a4015bc6cd64504f15':
  Import translations. DO NOT MERGE
 2015-01-07 14:34:03 +00:00
Geoff Mendal
620a5bd077 am 51aedf86: (-s ours) Import translations. DO NOT MERGE 
* commit '51aedf86037f027898ec279befe869c80ef9730c':
  Import translations. DO NOT MERGE
 2015-01-07 14:29:23 +00:00
Geoff Mendal
0347196c69 am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE 
* commit '1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
  Import translations. DO NOT MERGE
 2015-01-07 14:28:07 +00:00
Geoff Mendal
51aedf8603 Import translations. DO NOT MERGE 
Change-Id: I6ad655aeb29d245a44a42ccb3f8d43d84a47d422
Auto-generated-cl: translation import
 2015-01-07 06:22:13 -08:00
Geoff Mendal
1dcc3e5ca9 Import translations. DO NOT MERGE 
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
 2015-01-07 06:14:40 -08: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
2399c4500c am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev 
* commit '59f4d20b2e818c56e30b9a6e9fa6b693aaad7bbf':
  Add an item to "Legal information" screen for WebView license
 2015-01-07 12:40:43 +00:00
Zoltan Szatmary-Ban
d4e7dcb9d5 am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev 
* commit '15e2c54a2f4b75812b04bb32c6feb58158f0f318':
  Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
 2015-01-07 12:40:42 +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
2c9d75a7c3 am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev 
* commit 'be3b0c4ec09b90bbcc7284f008599479ba52c240':
  Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
 2015-01-06 20:51:17 +00:00
Sanket Padawe
be3b0c4ec0 Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev 2015-01-06 20:46:17 +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
Amith Yamasani
0eda07657a am 43bdc5cd: am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev 
* commit '43bdc5cdcf520fb0cae3b2fb2598d13957f1a770':
  Fix theme for empty activity
 2015-01-05 21:03:29 +00:00
Amith Yamasani
43bdc5cdcf am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev 
* commit '10fb4f80ae31b27fb563d3139fa2cc90f0a9aad8':
  Fix theme for empty activity
 2015-01-05 20:57:57 +00:00
Amith Yamasani
10fb4f80ae Merge "Fix theme for empty activity" into lmp-mr1-dev 2015-01-05 20:54:04 +00: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