PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,174 Commits 1 Branch 0 Tags
cbcc76e8d32f95690d08258a91d58136cd9fb056
Commit Graph

20174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Geoff Mendal
f6f9380c82 am 08f6d923: (-s ours) am a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '08f6d92343e0fb8d03aae1b369797166a2e56870':
  Import translations. DO NOT MERGE
 2015-01-05 14:36:40 +00:00
Geoff Mendal
8dfaf90444 am cb84797d: (-s ours) am 353c5b50: (-s ours) am 7e669a0a: (-s ours) Import translations. DO NOT MERGE 
* commit 'cb84797d86db4e386a477c3ac569c28aee10ddd0':
  Import translations. DO NOT MERGE
 2015-01-05 14:36:39 +00:00
Geoff Mendal
11c2c80f9d Import translations. DO NOT MERGE 
Change-Id: Ib29187f3cc18e0b6774a65b7fc34623fd290c0f9
Auto-generated-cl: translation import
 2015-01-05 06:34:10 -08:00
Geoff Mendal
08f6d92343 am a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a5aa9accbf96f3295d086e8e226e30827f70519e':
  Import translations. DO NOT MERGE
 2015-01-05 14:31:06 +00:00
Geoff Mendal
cb84797d86 am 353c5b50: (-s ours) am 7e669a0a: (-s ours) Import translations. DO NOT MERGE 
* commit '353c5b5010396152cdc8b9bb7f5717c0ac8a1296':
  Import translations. DO NOT MERGE
 2015-01-05 14:31:05 +00:00
Geoff Mendal
a5aa9accbf Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-05 14:29:58 +00:00
Geoff Mendal
353c5b5010 am 7e669a0a: (-s ours) Import translations. DO NOT MERGE 
* commit '7e669a0ae5d9590c69aa59806fbce8b53052b46f':
  Import translations. DO NOT MERGE
 2015-01-05 14:27:37 +00:00
Geoff Mendal
e421be56cf Import translations. DO NOT MERGE 
Change-Id: Ia39277fe2bc9e2c171eec7349b5e829787311c84
Auto-generated-cl: translation import
 2015-01-05 06:23:03 -08:00
Geoff Mendal
7e669a0ae5 Import translations. DO NOT MERGE 
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
 2015-01-05 06:15:47 -08: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
Baligh Uddin
7f55e9685e am c0b5d542: (-s ours) Import translations. DO NOT MERGE automerge: c3068f0 -s ours automerge: 9602ba3 -s ours 
* commit 'c0b5d542b6f68dfcd0c90496d487986c9727da84':
  Import translations. DO NOT MERGE
 2014-12-30 12:14:29 +00:00
Baligh Uddin
0223c588de am 617918d6: (-s ours) Import translations. DO NOT MERGE automerge: ad3b94f -s ours 
* commit '617918d61b3023d2f6910b4097ea1b772612372c':
  Import translations. DO NOT MERGE
 2014-12-30 12:14:28 +00:00
Baligh Uddin
c0b5d542b6 Import translations. DO NOT MERGE automerge: c3068f0 -s ours 
automerge: 9602ba3  -s ours

* commit '9602ba376289d130d0e86a454a6740456cec616e':
  Import translations. DO NOT MERGE
 2014-12-30 03:15:42 +00:00
Baligh Uddin
617918d61b Import translations. DO NOT MERGE 
automerge: ad3b94f  -s ours

* commit 'ad3b94fbdea2364b3c89e5a8409acf623675a20a':
  Import translations. DO NOT MERGE
 2014-12-30 03:15:29 +00:00
Baligh Uddin
9602ba3762 Import translations. DO NOT MERGE 
automerge: c3068f0  -s ours

* commit 'c3068f078887f3357b498a0851591c324d3c55d5':
  Import translations. DO NOT MERGE
 2014-12-30 00:53:43 +00:00
Baligh Uddin
002b571f74 Merge "Import translations. DO NOT MERGE" 2014-12-30 00:01:36 +00:00
Baligh Uddin
56218aaff5 Import translations. DO NOT MERGE 
Change-Id: Ib8589ead8d33840685d974638bf09e97ca7ce66d
Auto-generated-cl: translation import
 2014-12-29 15:23:00 -08:00
Baligh Uddin
ad3b94fbde Import translations. DO NOT MERGE 
Change-Id: I2a95cc3df31da8342436e918b02792d4624e5e88
Auto-generated-cl: translation import
 2014-12-29 15:11:40 -08:00
Baligh Uddin
c3068f0788 Import translations. DO NOT MERGE 
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
 2014-12-29 14:59:54 -08:00
Prem Kumar
78107661a4 am 5aebac31: am 70c4a7b1: am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev 
* commit '5aebac31e8b0eb5bf914a822782515969949d507':
  SIM Status now shows data connection instead of voice.
 2014-12-29 17:33:22 +00:00
Sanket Padawe
cd6ae3cc3f am d1724df6: am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev automerge: f128cff 
* commit 'd1724df60235b33534a02dd3cc445e6b761f43e3':
  Fixed settings crash issue while recovering from phone crash.
 2014-12-29 17:25:33 +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
70c4a7b145 am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev 
* commit '531127a5c2293e46e16fb9bc013078506c15122e':
  SIM Status now shows data connection instead of voice.
 2014-12-29 13:28:18 +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
Baligh Uddin
c7a8720f53 am ac379b54: (-s ours) am 8ac88edc: (-s ours) am e957cb47: (-s ours) Import translations. DO NOT MERGE 
* commit 'ac379b544f9508cc10cbe48d9058cf65a3ad8123':
  Import translations. DO NOT MERGE
 2014-12-24 19:04:59 +00:00
Baligh Uddin
478e056fc5 am 20c14041: (-s ours) am 6ccde759: (-s ours) Import translations. DO NOT MERGE 
* commit '20c1404198aa6948aee6374b29daa292f47c1cf6':
  Import translations. DO NOT MERGE
 2014-12-24 19:04:56 +00:00