OSDN Git Service
Sanket Padawe [Thu, 15 Jan 2015 04:29:28 +0000 (04:29 +0000)]
am
56b16015: am
872ed290: am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
56b16015bcd0c9cecdf71e1276ef6665856c3b09':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Thu, 15 Jan 2015 04:29:26 +0000 (04:29 +0000)]
am
2c19066e: am
0f9db227: am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
2c19066e0080015950893fb5655f445adf76743e':
Fixed data connection toggle UI issue due to local cache maintained.
Geoff Mendal [Thu, 15 Jan 2015 02:56:35 +0000 (02:56 +0000)]
am
1b1a08fd: (-s ours) am
9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
1b1a08fdb8675f233a9f0f4d5d42aea87770b174':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 15 Jan 2015 02:56:34 +0000 (02:56 +0000)]
am
7b62336f: (-s ours) am
3d600a06: (-s ours) am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
7b62336f26bc5966080e8153690da4fa28f5adf3':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 15 Jan 2015 00:42:24 +0000 (00:42 +0000)]
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.
Sanket Padawe [Thu, 15 Jan 2015 00:42:23 +0000 (00:42 +0000)]
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.
Sanket Padawe [Wed, 14 Jan 2015 23:50:44 +0000 (23:50 +0000)]
am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
b57e1f29643e7454192973db738c13583b5c91a5':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Wed, 14 Jan 2015 23:50:43 +0000 (23:50 +0000)]
am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
e79b65d6c6f6df7d6fd84a6f5c540bd99d71f152':
Fixed data connection toggle UI issue due to local cache maintained.
Sanket Padawe [Wed, 14 Jan 2015 23:20:04 +0000 (23:20 +0000)]
Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 23:18:13 +0000 (23:18 +0000)]
Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 22:48:27 +0000 (14:48 -0800)]
Fixed missing sim card lock setup in Security Settings.
Bug:
19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
Adrian Roos [Wed, 14 Jan 2015 22:32:47 +0000 (22:32 +0000)]
Merge "Remove usages of LPU.savedPatternExists"
Lucky Zhang [Wed, 14 Jan 2015 22:32:31 +0000 (22:32 +0000)]
am
585b53e6: am
0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
automerge:
591a091
* commit '
591a09131162a32ad5923dc3553a464a5da1d39c':
[Settings] Wifi Setup responds to other connection state change
Adrian Roos [Wed, 14 Jan 2015 20:41:47 +0000 (20:41 +0000)]
Merge "Purge biometric weak from internal code"
Fyodor Kupolov [Wed, 14 Jan 2015 20:14:24 +0000 (20:14 +0000)]
Merge "Show confirmation when turning on "Phone calls/sms""
Geoff Mendal [Wed, 14 Jan 2015 19:24:21 +0000 (19:24 +0000)]
am
9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
9b07944c5007460b8c6792321e5db1350ec3ff55':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 19:24:20 +0000 (19:24 +0000)]
am
3d600a06: (-s ours) am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3d600a06119f2c11ba2394d64a84348aa94fd520':
Import translations. DO NOT MERGE
Sanket Padawe [Wed, 14 Jan 2015 19:03:33 +0000 (11:03 -0800)]
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
Geoff Mendal [Wed, 14 Jan 2015 14:33:29 +0000 (06:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6d825f2584c9d3924d1fab1e8f2c56e6f71e2004
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 14:24:51 +0000 (14:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 14 Jan 2015 14:23:15 +0000 (14:23 +0000)]
am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
c51cfe3d8131084cebf674b06faa7360307b5425':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 14:23:07 +0000 (06:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 14:16:00 +0000 (06:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
Lucky Zhang [Wed, 14 Jan 2015 12:06:43 +0000 (12:06 +0000)]
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
Lucky Zhang [Wed, 14 Jan 2015 11:59:54 +0000 (11:59 +0000)]
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
Lucky Zhang [Wed, 14 Jan 2015 01:36:45 +0000 (01:36 +0000)]
Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
Lucky Zhang [Tue, 13 Jan 2015 18:22:28 +0000 (10:22 -0800)]
[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
Wink Saville [Tue, 13 Jan 2015 21:11:14 +0000 (21:11 +0000)]
am
cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
automerge:
bcad54f
* commit '
bcad54f6474b264a04a4f59fb8ad6371861f1a62':
Wink Saville [Tue, 13 Jan 2015 21:11:07 +0000 (21:11 +0000)]
am
a908d819: am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
automerge:
1015f08
* commit '
1015f08455da4c0823d98d5f74104e0fc3b7de33':
Rename reg/unreg OnSubscriptionsChangedListener.
Geoff Mendal [Tue, 13 Jan 2015 20:16:32 +0000 (20:16 +0000)]
am
4fe6117c: (-s ours) am
26310772: (-s ours) Import translations. DO NOT MERGE
automerge:
4d23238 -s ours
* commit '
4d232386311f8dbaa5baaa3781b592d3e527660c':
Import translations. DO NOT MERGE
Wink Saville [Tue, 13 Jan 2015 19:16:06 +0000 (19:16 +0000)]
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':
Wink Saville [Tue, 13 Jan 2015 19:16:05 +0000 (19:16 +0000)]
am
a908d819: am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
a908d8191acf3e4786933d67a1a4211543323a7d':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:10:40 +0000 (19:10 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
Wink Saville [Tue, 13 Jan 2015 19:09:54 +0000 (19:09 +0000)]
Rename reg/unreg OnSubscriptionsChangedListener.
automerge:
718c4d9
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:09:51 +0000 (19:09 +0000)]
am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 00:50:58 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Geoff Mendal [Mon, 12 Jan 2015 23:45:01 +0000 (23:45 +0000)]
am
04250824: (-s ours) Import translations. DO NOT MERGE
automerge:
3f2ece6 -s ours
* commit '
3f2ece6ceae3923dca0d54b2e65fa16e79e3752c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:40:27 +0000 (16:40 +0000)]
am
4fe6117c: (-s ours) am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:14:28 +0000 (16:14 +0000)]
am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
26310772872b327029cad560fa7b3e797b7980e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:14:25 +0000 (16:14 +0000)]
am
04250824: (-s ours) Import translations. DO NOT MERGE
* commit '
04250824ff4d5231ee17a060a7ce77fcc02a6657':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 15:14:04 +0000 (07:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I434030eb3a517745ca132ec904e91b8f90dc47ed
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Jan 2015 15:03:11 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Jan 2015 14:55:33 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
Sanket Padawe [Fri, 9 Jan 2015 19:23:23 +0000 (19:23 +0000)]
am
058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge:
270af42
automerge:
dd0a5db
* commit '
dd0a5db0ddf16d49161053b1e0aafa7acf158a11':
Display Voice nw type if Data nw is Unknown for Sprout.
Sanket Padawe [Fri, 9 Jan 2015 19:17:18 +0000 (19:17 +0000)]
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.
Sanket Padawe [Fri, 9 Jan 2015 19:11:35 +0000 (19:11 +0000)]
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.
Sanket Padawe [Fri, 9 Jan 2015 19:08:26 +0000 (19:08 +0000)]
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
Adrian Roos [Thu, 8 Jan 2015 15:20:00 +0000 (16:20 +0100)]
Remove usages of LPU.savedPatternExists
The correct method to call is isLockPatternEnabled, which
also checks whether we've actually selected a pattern.
Also removes the code for the obsolete pattern enabled setting.
Bug:
18931518
Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
Alexandra Gherghina [Fri, 9 Jan 2015 10:41:40 +0000 (10:41 +0000)]
Merge "Fix width of app notifications detail screen"
Sanket Padawe [Thu, 8 Jan 2015 23:25:19 +0000 (23:25 +0000)]
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
Sanket Padawe [Thu, 8 Jan 2015 23:19:38 +0000 (23:19 +0000)]
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
Sanket Padawe [Thu, 8 Jan 2015 23:15:10 +0000 (23:15 +0000)]
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
Sanket Padawe [Thu, 8 Jan 2015 23:09:10 +0000 (23:09 +0000)]
Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 20:37:34 +0000 (12:37 -0800)]
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
Sanket Padawe [Thu, 8 Jan 2015 19:23:11 +0000 (11:23 -0800)]
Fixed Cellular data toggling issue in settings for multisim
Bug:
18916033
Bug:
18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
Fyodor Kupolov [Mon, 29 Dec 2014 21:40:27 +0000 (13:40 -0800)]
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
Marco Nelissen [Thu, 8 Jan 2015 18:48:47 +0000 (10:48 -0800)]
Register USB receiver
This makes USB mode selection work properly, and prevents developer
options from crashing on exit.
Change-Id: I4c822f2694b0d87438827ff0da0d974c93ddbcab
Benjamin Franz [Thu, 8 Jan 2015 17:54:29 +0000 (17:54 +0000)]
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.
Benjamin Franz [Thu, 8 Jan 2015 17:49:11 +0000 (17:49 +0000)]
am
d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge:
ceee535
* commit '
d8e53f271f1aa90f92d239f48120ffc6c5b87055':
Block BluetoothPermissionRequest notification on managed profiles.
Benjamin Franz [Thu, 8 Jan 2015 17:43:02 +0000 (17:43 +0000)]
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
automerge:
ceee535
* commit '
ceee535c6533cd5ba047ede780ca9c089b84fb9f':
Block BluetoothPermissionRequest notification on managed profiles.
Benjamin Franz [Thu, 8 Jan 2015 17:40:09 +0000 (17:40 +0000)]
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
Alexandra Gherghina [Wed, 7 Jan 2015 16:57:46 +0000 (16:57 +0000)]
Fix width of app notifications detail screen
Bug:
17137945
Change-Id: I52056f6ff217b695a21b096145b13b6b687e124c
Adrian Roos [Wed, 7 Jan 2015 19:51:57 +0000 (20:51 +0100)]
Purge biometric weak from internal code
Bug:
18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
Andres Morales [Wed, 7 Jan 2015 16:37:55 +0000 (16:37 +0000)]
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
Andres Morales [Wed, 7 Jan 2015 16:31:57 +0000 (16:31 +0000)]
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
Andres Morales [Wed, 7 Jan 2015 16:26:19 +0000 (16:26 +0000)]
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
Andres Morales [Wed, 7 Jan 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 14:40:59 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 7 Jan 2015 14:39:51 +0000 (14:39 +0000)]
am
634b1706: (-s ours) am
0347196c: (-s ours) am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
634b17063b79167ae0c0459afa7b528d933c4011':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:34:44 +0000 (14:34 +0000)]
am
620a5bd0: (-s ours) am
51aedf86: (-s ours) Import translations. DO NOT MERGE
* commit '
620a5bd077c7077058f460af5025ad7d2cd94758':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)]
am
0347196c: (-s ours) am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
0347196c6992e490be74c2a4015bc6cd64504f15':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:32:58 +0000 (06:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1e314926eb51781537d45825f1b2ec7178a73969
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Jan 2015 14:29:23 +0000 (14:29 +0000)]
am
51aedf86: (-s ours) Import translations. DO NOT MERGE
* commit '
51aedf86037f027898ec279befe869c80ef9730c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:28:07 +0000 (14:28 +0000)]
am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:22:13 +0000 (06:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6ad655aeb29d245a44a42ccb3f8d43d84a47d422
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Jan 2015 14:14:40 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
Mikhail Naganov [Wed, 7 Jan 2015 12:56:04 +0000 (12:56 +0000)]
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
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:56:03 +0000 (12:56 +0000)]
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
Mikhail Naganov [Wed, 7 Jan 2015 12:50:04 +0000 (12:50 +0000)]
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
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:50:02 +0000 (12:50 +0000)]
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
Mikhail Naganov [Wed, 7 Jan 2015 12:40:43 +0000 (12:40 +0000)]
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
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:40:42 +0000 (12:40 +0000)]
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
Mikhail Naganov [Wed, 7 Jan 2015 12:33:28 +0000 (12:33 +0000)]
Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:31:55 +0000 (12:31 +0000)]
Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
Alexandra Gherghina [Wed, 7 Jan 2015 08:59:12 +0000 (08:59 +0000)]
Merge "Remove call to deprecated getBackgroundDataSetting()"
Sanket Padawe [Tue, 6 Jan 2015 21:02:23 +0000 (21:02 +0000)]
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.
Sanket Padawe [Tue, 6 Jan 2015 20:56:36 +0000 (20:56 +0000)]
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.
Mikhail Naganov [Mon, 15 Dec 2014 17:09:50 +0000 (17:09 +0000)]
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
Sanket Padawe [Tue, 6 Jan 2015 20:51:17 +0000 (20:51 +0000)]
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.
Sanket Padawe [Tue, 6 Jan 2015 20:46:16 +0000 (20:46 +0000)]
Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
Sanket Padawe [Tue, 6 Jan 2015 18:54:55 +0000 (10:54 -0800)]
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Bug:
18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
Andres Morales [Tue, 6 Jan 2015 17:38:53 +0000 (09:38 -0800)]
Don't display Write NFC option if no NFC
Bug:
18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
Alexandra Gherghina [Mon, 5 Jan 2015 09:58:14 +0000 (09:58 +0000)]
Remove call to deprecated getBackgroundDataSetting()
It seems that the setting is now enforced at the network level (see
NetworkPolicyManagerService).
Bug:
15848128
Change-Id: Ie7d178bab8ebb133f78cb5356ee1c27fbe61ba05
Sanket Padawe [Mon, 5 Jan 2015 22:46:14 +0000 (14:46 -0800)]
Grey out sim select dialog for Calls when only 1 phoneAccount exists
Bug:
18685720
Change-Id: Id7c8f756fd958fc81086a0166f1b0423c62e2569
Amith Yamasani [Mon, 5 Jan 2015 21:10:11 +0000 (21:10 +0000)]
am
0eda0765: am
43bdc5cd: am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
0eda07657aad4a05d50896410ab56b48570e7d57':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 21:03:29 +0000 (21:03 +0000)]
am
43bdc5cd: am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
43bdc5cdcf520fb0cae3b2fb2598d13957f1a770':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 20:57:57 +0000 (20:57 +0000)]
am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
10fb4f80ae31b27fb563d3139fa2cc90f0a9aad8':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 20:54:04 +0000 (20:54 +0000)]
Merge "Fix theme for empty activity" into lmp-mr1-dev
Zoltan Szatmary-Ban [Mon, 5 Jan 2015 16:41:35 +0000 (16:41 +0000)]
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
Geoff Mendal [Mon, 5 Jan 2015 14:36:40 +0000 (14:36 +0000)]
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