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
2014-12-30 03:15:42 +00:00
Baligh Uddin
617918d61b
Import translations. DO NOT MERGE
...
automerge: ad3b94f
2014-12-30 03:15:29 +00:00
Baligh Uddin
9602ba3762
Import translations. DO NOT MERGE
...
automerge: c3068f0
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
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
Baligh Uddin
ac379b544f
am 8ac88edc: (-s ours) am e957cb47: (-s ours) Import translations. DO NOT MERGE
...
* commit '8ac88edc032abfb3d1105f3f2b66ef5c39d1cf8f':
Import translations. DO NOT MERGE
2014-12-24 18:57:57 +00:00
Baligh Uddin
20c1404198
am 6ccde759: (-s ours) Import translations. DO NOT MERGE
...
* commit '6ccde759cb6ca078ed47696b1cb7092e6ff96927':
Import translations. DO NOT MERGE
2014-12-24 18:57:55 +00:00
Sanket Padawe
f128cff21e
am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
...
* commit '9b1383a46dadd60ed89561083b01666242d457dd':
Fixed settings crash issue while recovering from phone crash.
2014-12-23 03:39:18 +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
Baligh Uddin
8ac88edc03
am e957cb47: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e957cb47a4d2bca7f5d3e8e925efae6269754cb3':
Import translations. DO NOT MERGE
2014-12-22 17:46:47 +00:00
Baligh Uddin
36ddc8a1c3
Import translations. DO NOT MERGE
...
Change-Id: I0276ab183a6b8f4f2afef13961cd91e1e4593587
Auto-generated-cl: translation import
2014-12-22 09:12:51 -08:00
Baligh Uddin
6ccde759cb
Import translations. DO NOT MERGE
...
Change-Id: I3f4b4d374faee184252c651295a6298c621fbcfd
Auto-generated-cl: translation import
2014-12-22 09:01:37 -08:00
Baligh Uddin
e957cb47a4
Import translations. DO NOT MERGE
...
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
2014-12-22 08:50:56 -08:00
Maurice Lam
9927556e8f
am 9e1a3d6f: am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev automerge: e24c760
...
* commit '9e1a3d6fc58a99cdc15024d8447744e1eaff10ba':
[WifiSetup] Fix text colors in dark theme
2014-12-20 07:55:12 +00:00
Maurice Lam
9e1a3d6fc5
am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
...
automerge: e24c760
2014-12-20 07:48:45 +00:00
Maurice Lam
e24c760511
am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
...
* commit '9ab9d1ec82047b74a6a4fc91ab5864086e715c35':
[WifiSetup] Fix text colors in dark theme
2014-12-20 01:23:53 +00:00
Maurice Lam
9ab9d1ec82
Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
2014-12-20 01:17:59 +00:00
PauloftheWest
876f6bbae8
am 68b93e68: am 1a5d132f: am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
...
* commit '68b93e68e2cb1f3d45391da8bbc3a6d46115a28c':
Removed extraneous slot information on single SIM devices.
2014-12-19 23:08:39 +00: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
1a5d132fcb
am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
...
* commit '3e864c0bdae3ff9801e04438b8347631b3153d6d':
Removed extraneous slot information on single SIM devices.
2014-12-19 22:57: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
Maurice Lam
b413c523c0
[WifiSetup] Fix text colors in dark theme
...
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.
Bug: 18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
2014-12-19 11:52:52 -08:00
Zoltan Szatmary-Ban
d7cadf3de2
Eliminate duplicated code for creating circled user icons in Settings.
...
Use Utils.getUserIcon instead.
Change-Id: Id653f8c89ac041e925464c88bbc0c7c43d3ce632
2014-12-19 15:23:16 +00:00
Zoltan Szatmary-Ban
53b4387719
Merge "Badge items in Settings > Apps > Running correctly"
2014-12-19 10:24:01 +00:00
Fyodor Kupolov
2c875e4537
Merge "Remove Users & profiles header for phones"
2014-12-19 01:47:13 +00:00
Sanket Padawe
cd5863c388
am ec3f7998: am eec0c11a: am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit 'ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 23:20:44 +00:00
