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

19351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
08309d2072 Merge "Fix width of app notifications detail screen" 2015-01-09 10:41:42 +00:00
Sanket Padawe
4e4860bbcb am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 
automerge: c7e5b42

* commit 'c7e5b42ac493f7f06fd8d90f87a4e7eb23acc54c':
  Fixed Cellular data toggling issue in settings for multisim
 2015-01-08 23:25:19 +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
Fyodor Kupolov
dbbd4fca44 Show confirmation when turning on "Phone calls/sms" 
Added confirmation dialog, when turning on "Phone calls and sms" setting for
secondary users and guests.

Bug:15761405
Change-Id: I39b2181f0b5460db9a964c6883f053a6c6336622
 2015-01-08 11:21:26 -08:00
Marco Nelissen
2c47e6f823 Register USB receiver 
This makes USB mode selection work properly, and prevents developer
options from crashing on exit.

Change-Id: I4c822f2694b0d87438827ff0da0d974c93ddbcab
 2015-01-08 10:49:46 -08:00
Benjamin Franz
6a0cd973d8 am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535 
automerge: cc18d73

* commit 'cc18d7393bfcd11a668623f6a322243dc733fdc8':
  Block BluetoothPermissionRequest notification on managed profiles.
 2015-01-08 17:54:29 +00: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
Alexandra Gherghina
fa7dacb157 Fix width of app notifications detail screen 
Bug: 17137945
Change-Id: I52056f6ff217b695a21b096145b13b6b687e124c
 2015-01-08 10:36:17 +00:00
Adrian Roos
f788718f21 Purge biometric weak from internal code 
Bug: 18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
 2015-01-07 20:52:09 +01:00
Andres Morales
c2fb78627f am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev 
* commit 'dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
  Don't display Write NFC option if no NFC
 2015-01-07 16:37:55 +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
3d0961c789 Merge "Import translations. DO NOT MERGE" 2015-01-07 14:41:00 +00:00
Geoff Mendal
2f45b7aba9 am 634b1706: (-s ours) am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE 
* commit '634b17063b79167ae0c0459afa7b528d933c4011':
  Import translations. DO NOT MERGE
 2015-01-07 14:39:51 +00:00
Geoff Mendal
ab9a7e2bfe am 620a5bd0: (-s ours) am 51aedf86: (-s ours) Import translations. DO NOT MERGE 
* commit '620a5bd077c7077058f460af5025ad7d2cd94758':
  Import translations. DO NOT MERGE
 2015-01-07 14:34:44 +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
50dc4aaba9 Import translations. DO NOT MERGE 
Change-Id: I1e314926eb51781537d45825f1b2ec7178a73969
Auto-generated-cl: translation import
 2015-01-07 06:32:58 -08: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
6a3ccd176f am 8ada2c53: am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev 
* commit '8ada2c53b9322b7c95aff818e251cb31850ed124':
  Add an item to "Legal information" screen for WebView license
 2015-01-07 12:56:04 +00:00
Zoltan Szatmary-Ban
9de861247f am c374175f: am d4e7dcb9: am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev 
* commit 'c374175f61aff876f895cf15664ea66f54978aaf':
  Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
 2015-01-07 12:56:03 +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
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
Alexandra Gherghina
2abb36aaa6 Merge "Remove call to deprecated getBackgroundDataSetting()" 2015-01-07 08:59:14 +00:00
Sanket Padawe
f04bf1c322 am 310b5336: am 2c9d75a7: am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev 
* commit '310b533689ac9ecd6ee3e9abbd4029882522358f':
  Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
 2015-01-06 21:02:23 +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
Alexandra Gherghina
7e50b12fde Remove call to deprecated getBackgroundDataSetting() 
It seems that the setting is now enforced at the network level (see
NetworkPolicyManagerService).

Bug: 15848128
Change-Id: Ie7d178bab8ebb133f78cb5356ee1c27fbe61ba05
 2015-01-06 11:01:50 +00:00
Sanket Padawe
c8c82f002d Grey out sim select dialog for Calls when only 1 phoneAccount exists 
Bug: 18685720
Change-Id: Id7c8f756fd958fc81086a0166f1b0423c62e2569
 2015-01-05 23:00:42 +00:00
Amith Yamasani
9f0eaf19b3 am 0eda0765: am 43bdc5cd: am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev 
* commit '0eda07657aad4a05d50896410ab56b48570e7d57':
  Fix theme for empty activity
 2015-01-05 21:10:11 +00: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