OSDN Git Service
Sudheer Shanka [Mon, 28 Mar 2016 17:36:31 +0000 (17:36 +0000)]
Merge "Fix crash in ApnSettings." into nyc-dev am:
2cfda2a
am:
38a266a
* commit '
38a266a6815a1b5bcce6775bb1c60e34737ee9b0':
Fix crash in ApnSettings.
Sudheer Shanka [Mon, 28 Mar 2016 17:36:31 +0000 (17:36 +0000)]
Merge "Fix crash in AndroidBeam class." into nyc-dev am:
2fff06e
am:
d459e35
* commit '
d459e355776cea28656af71e84fe5930885fba7c':
Fix crash in AndroidBeam class.
Sudheer Shanka [Mon, 28 Mar 2016 17:32:36 +0000 (17:32 +0000)]
Merge "Fix crash in ApnSettings." into nyc-dev
am:
2cfda2a
* commit '
2cfda2a3bd796585c02f93dae628896ac077aa98':
Fix crash in ApnSettings.
Sudheer Shanka [Mon, 28 Mar 2016 17:32:35 +0000 (17:32 +0000)]
Merge "Fix crash in AndroidBeam class." into nyc-dev
am:
2fff06e
* commit '
2fff06e91816ff787dfcbaf4de3cb71f9ce91282':
Fix crash in AndroidBeam class.
Sudheer Shanka [Mon, 28 Mar 2016 17:18:54 +0000 (17:18 +0000)]
Merge "Fix crash in ApnSettings." into nyc-dev
Sudheer Shanka [Mon, 28 Mar 2016 17:18:36 +0000 (17:18 +0000)]
Merge "Fix crash in AndroidBeam class." into nyc-dev
Geoff Mendal [Mon, 28 Mar 2016 15:09:13 +0000 (15:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
3efe250 -s ours
am:
0e4d7cf -s ours
* commit '
0e4d7cf33fad229505c506e1f1b18c7e2cfc1833':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 28 Mar 2016 15:01:32 +0000 (15:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
3efe250 -s ours
* commit '
3efe25059f3f94167de96f9e48052bfeb61c2dfb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 28 Mar 2016 14:46:13 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 28 Mar 2016 14:42:47 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
Jason Monk [Mon, 28 Mar 2016 14:27:37 +0000 (14:27 +0000)]
Merge changes I22d799f8,I1bc14e7a into nyc-dev am:
2de6a28
am:
81ab842
* commit '
81ab8425630d3a3ac51109a045384a708ad9799c':
Guard against crash in dev options
Switch to whitelist for animations
Jason Monk [Mon, 28 Mar 2016 14:23:50 +0000 (14:23 +0000)]
Merge changes I22d799f8,I1bc14e7a into nyc-dev
am:
2de6a28
* commit '
2de6a287cad72cb7939df3702dabd4aa559fe0c9':
Guard against crash in dev options
Switch to whitelist for animations
Jason Monk [Mon, 28 Mar 2016 14:14:01 +0000 (14:14 +0000)]
Merge changes I22d799f8,I1bc14e7a into nyc-dev
* changes:
Guard against crash in dev options
Switch to whitelist for animations
Geoff Mendal [Mon, 28 Mar 2016 13:33:52 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8303e337afd764231eb307766b38e08b766d8f7a
Auto-generated-cl: translation import
Bill Yi [Sat, 26 Mar 2016 17:42:50 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
2d17f93 -s ours
am:
937ad3c -s ours
* commit '
937ad3c1a240afa4303f44fb137f35a336bf4974':
Import translations. DO NOT MERGE
Bill Yi [Sat, 26 Mar 2016 17:39:16 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2d17f93 -s ours
* commit '
2d17f93122cc0630a1ad6bffbdcdddc16a143ac4':
Import translations. DO NOT MERGE
Bill Yi [Sat, 26 Mar 2016 17:26:30 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 26 Mar 2016 17:26:10 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Sat, 26 Mar 2016 07:37:09 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
Bill Yi [Sat, 26 Mar 2016 06:52:45 +0000 (23:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7bc995d474f548d4628f0b73991a1c8b181f0d45
Auto-generated-cl: translation import
Christopher Tate [Sat, 26 Mar 2016 00:19:38 +0000 (00:19 +0000)]
Call it "Opening links" now am:
13d79b2
am:
8d5561f
* commit '
8d5561fc3e54138886e7ee76911df3f9c3f3cf99':
Call it "Opening links" now
Christopher Tate [Sat, 26 Mar 2016 00:16:39 +0000 (00:16 +0000)]
Call it "Opening links" now
am:
13d79b2
* commit '
13d79b2a252ac4bbb55e110782f5d166d1ed4db7':
Call it "Opening links" now
Christopher Tate [Thu, 24 Mar 2016 23:48:32 +0000 (16:48 -0700)]
Call it "Opening links" now
Better labels are better.
Bug
27834016
Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
Alan Viverette [Fri, 25 Mar 2016 20:10:07 +0000 (20:10 +0000)]
Merge "Move DensityUtils into SettingsLib" into nyc-dev am:
30dbd47
am:
447bb2f
* commit '
447bb2f7dad8133f1f18e1f3b627affda6e4bdfe':
Move DensityUtils into SettingsLib
Alan Viverette [Fri, 25 Mar 2016 20:06:34 +0000 (20:06 +0000)]
Merge "Move DensityUtils into SettingsLib" into nyc-dev
am:
30dbd47
* commit '
30dbd47a29fb12f1a5c5027d6719397fb322fe9e':
Move DensityUtils into SettingsLib
Alan Viverette [Fri, 25 Mar 2016 19:59:37 +0000 (19:59 +0000)]
Merge "Move DensityUtils into SettingsLib" into nyc-dev
Alan Viverette [Fri, 25 Mar 2016 18:56:25 +0000 (14:56 -0400)]
Move DensityUtils into SettingsLib
Bug:
27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
Philip P. Moltmann [Fri, 25 Mar 2016 16:58:52 +0000 (16:58 +0000)]
Merge "Use changed getStatus interface" into nyc-dev am:
872f621
am:
a18db31
* commit '
a18db3133a7c367c1fcf5aad910ee41fa600e833':
Use changed getStatus interface
Philip P. Moltmann [Fri, 25 Mar 2016 16:56:31 +0000 (16:56 +0000)]
Merge "Use changed getStatus interface" into nyc-dev
am:
872f621
* commit '
872f621eb358a2237f516a4bc783f3a7306ed3a6':
Use changed getStatus interface
Philip P. Moltmann [Fri, 25 Mar 2016 16:50:34 +0000 (16:50 +0000)]
Merge "Use changed getStatus interface" into nyc-dev
Philip P. Moltmann [Fri, 18 Mar 2016 16:38:24 +0000 (09:38 -0700)]
Use changed getStatus interface
Change-Id: I72a2aa74607e34a1afbef0982f634def3e30efd4
Udam Saini [Thu, 24 Mar 2016 22:45:00 +0000 (22:45 +0000)]
Merge "Updates spacing on redaction interstitial" into nyc-dev am:
375b981
am:
f7e45a7
* commit '
f7e45a7f281a399ed373d6aac892d63941be33de':
Updates spacing on redaction interstitial
Julia Reynolds [Thu, 24 Mar 2016 22:44:59 +0000 (22:44 +0000)]
Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev am:
befc5c5
am:
eb9dae0
* commit '
eb9dae04ab3a224f108d1911c09c9ed88c8678c9':
Rules without a configuration activity aren't clickable.
Udam Saini [Thu, 24 Mar 2016 22:40:16 +0000 (22:40 +0000)]
Merge "Updates spacing on redaction interstitial" into nyc-dev
am:
375b981
* commit '
375b981267aea4f3fb3374d2a6e18339125dd455':
Updates spacing on redaction interstitial
Julia Reynolds [Thu, 24 Mar 2016 22:40:16 +0000 (22:40 +0000)]
Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev
am:
befc5c5
* commit '
befc5c59eb7e896ab5ec7df423f3b9eec8726f01':
Rules without a configuration activity aren't clickable.
Sudheer Shanka [Thu, 24 Mar 2016 22:39:24 +0000 (15:39 -0700)]
Fix crash in ApnSettings.
ApnSettings runs with uid android.uid.phone and since it doesn't has
the MANAGE_DEVICE_ADMINS and MANAGE_PROFILE_AND_DEVICE_OWNERS
permission, show the generic support instead of the admin specific
message.
Bug:
27826969
Change-Id: I556a8b74aa1f692ebac1f4e30aeab3ed78ec5078
Udam Saini [Thu, 24 Mar 2016 22:20:10 +0000 (22:20 +0000)]
Merge "Updates spacing on redaction interstitial" into nyc-dev
Julia Reynolds [Thu, 24 Mar 2016 22:11:52 +0000 (22:11 +0000)]
Merge "Rules without a configuration activity aren't clickable." into nyc-dev
Julia Reynolds [Thu, 24 Mar 2016 21:22:13 +0000 (14:22 -0700)]
Rules without a configuration activity aren't clickable.
Bug:
27823109
Change-Id: Ifa2291627846e562f9a04ec1e85582833ab234de
Sudheer Shanka [Thu, 24 Mar 2016 19:21:45 +0000 (12:21 -0700)]
Fix crash in AndroidBeam class.
SwitchChangeListener is not added if admin disables the options, so
don't try to remove the listener in this case.
Bug:
27828118
Change-Id: Id0f9c71a10f93fc4c87af2b02ab7f04482145217
Robin Lee [Thu, 24 Mar 2016 18:44:46 +0000 (18:44 +0000)]
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev am:
1997f76
am:
32c3be8
* commit '
32c3be8e0392fd2f26ed505f52f048691628addd':
Implement action "android.settings.VPN_SETTINGS"
Robin Lee [Thu, 24 Mar 2016 18:41:16 +0000 (18:41 +0000)]
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
am:
1997f76
* commit '
1997f76cfc1ca3ee22d629db0504773f4f2abac3':
Implement action "android.settings.VPN_SETTINGS"
Robin Lee [Thu, 24 Mar 2016 18:32:51 +0000 (18:32 +0000)]
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
Hall Liu [Thu, 24 Mar 2016 17:43:04 +0000 (17:43 +0000)]
Merge "Add indicator for system dialer in Settings" into nyc-dev am:
f3dc18b
am:
736afac
* commit '
736afac6cbfdc2f96fc074afbc6f25f5243fba42':
Add indicator for system dialer in Settings
Hall Liu [Thu, 24 Mar 2016 17:39:30 +0000 (17:39 +0000)]
Merge "Add indicator for system dialer in Settings" into nyc-dev
am:
f3dc18b
* commit '
f3dc18b65bd78d7f00b6255208864cb6899674bc':
Add indicator for system dialer in Settings
Hall Liu [Thu, 24 Mar 2016 17:29:39 +0000 (17:29 +0000)]
Merge "Add indicator for system dialer in Settings" into nyc-dev
Fan Zhang [Thu, 24 Mar 2016 16:46:57 +0000 (16:46 +0000)]
Merge "Don't return anything from setTitleFromBackStack."
Fan Zhang [Wed, 23 Mar 2016 22:31:08 +0000 (15:31 -0700)]
Don't return anything from setTitleFromBackStack.
The return value is not consumed by anything.
Change-Id: Id024ac02f00861aa1c7f347676c648ab406011b1
Robin Lee [Thu, 24 Mar 2016 16:02:08 +0000 (16:02 +0000)]
Implement action "android.settings.VPN_SETTINGS"
Bug:
27700919
Change-Id: Ibd23f1d53d40addc2ff8ac3215f3524b7e8c9c2e
Daichi Hirono [Thu, 24 Mar 2016 02:53:04 +0000 (02:53 +0000)]
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev am:
98607d4
am:
28fa685
* commit '
28fa685ef3bdd1a5ea399172258bed15d97d1dbb':
Don't close USB type notification when USB is connected to USB devices.
Daichi Hirono [Thu, 24 Mar 2016 02:50:52 +0000 (02:50 +0000)]
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev
am:
98607d4
* commit '
98607d444903f5c74fe190f65800a5679b312c4e':
Don't close USB type notification when USB is connected to USB devices.
Daichi Hirono [Thu, 24 Mar 2016 02:46:23 +0000 (02:46 +0000)]
Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev
Yorke Lee [Wed, 23 Mar 2016 18:55:10 +0000 (18:55 +0000)]
Merge "Fix build" into nyc-dev am:
d0f8d92
am:
abe553e
* commit '
abe553ed0d4bd4f268b70b4850525fb9895fb7f3':
Fix build
Yorke Lee [Wed, 23 Mar 2016 18:47:58 +0000 (18:47 +0000)]
Merge "Fix build" into nyc-dev
am:
d0f8d92
* commit '
d0f8d9257b0b1076bbc5fa567fe98c2ae460a291':
Fix build
Udam Saini [Mon, 21 Mar 2016 22:32:24 +0000 (15:32 -0700)]
Updates spacing on redaction interstitial
Cleans up the look and feel on the redaction interstitial page
bug:
27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
Yorke Lee [Wed, 23 Mar 2016 18:17:57 +0000 (18:17 +0000)]
Merge "Fix build" into nyc-dev
Yorke Lee [Wed, 23 Mar 2016 18:11:46 +0000 (11:11 -0700)]
Fix build
Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68
Sudheer Shanka [Wed, 23 Mar 2016 18:10:59 +0000 (18:10 +0000)]
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev am:
45949f9
am:
0f0e2df
* commit '
0f0e2df40a2ff4537f430ee78ba08e6467e0fb4e':
Add more policy transparency for disallow_remove_user restriction.
Sudheer Shanka [Wed, 23 Mar 2016 18:10:59 +0000 (18:10 +0000)]
Merge "Add more policy transparency for wifi settings." into nyc-dev am:
ed0d4dd
am:
add53df
* commit '
add53dfcb1eec18615610a632493fb591f924170':
Add more policy transparency for wifi settings.
Sudheer Shanka [Wed, 23 Mar 2016 18:10:58 +0000 (18:10 +0000)]
Merge "Add disabled by policy empty views to more screens." into nyc-dev am:
561a88c
am:
9ddc14e
* commit '
9ddc14e7c72f4deb89c904efd2f57608c4da78ab':
Add disabled by policy empty views to more screens.
Sudheer Shanka [Wed, 23 Mar 2016 18:06:22 +0000 (18:06 +0000)]
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
am:
45949f9
* commit '
45949f9138f048a9dbf9789c7bd05b751137a0fb':
Add more policy transparency for disallow_remove_user restriction.
Sudheer Shanka [Wed, 23 Mar 2016 18:06:22 +0000 (18:06 +0000)]
Merge "Add more policy transparency for wifi settings." into nyc-dev
am:
ed0d4dd
* commit '
ed0d4dd463494c011ffcbd079ec321aa1d95e2b4':
Add more policy transparency for wifi settings.
Sudheer Shanka [Wed, 23 Mar 2016 18:06:21 +0000 (18:06 +0000)]
Merge "Add disabled by policy empty views to more screens." into nyc-dev
am:
561a88c
* commit '
561a88cfcd21bcfd2a02c9fa3f3575566ccf7a72':
Add disabled by policy empty views to more screens.
Sudheer Shanka [Wed, 23 Mar 2016 17:53:24 +0000 (17:53 +0000)]
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
Sudheer Shanka [Wed, 23 Mar 2016 17:53:19 +0000 (17:53 +0000)]
Merge "Add more policy transparency for wifi settings." into nyc-dev
Sudheer Shanka [Wed, 23 Mar 2016 17:53:15 +0000 (17:53 +0000)]
Merge "Add disabled by policy empty views to more screens." into nyc-dev
Abodunrinwa Toki [Wed, 23 Mar 2016 16:16:53 +0000 (16:16 +0000)]
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev am:
14df560
am:
181b63e
* commit '
181b63ebe09e2ef24bc1d2ad96d79e383525ed02':
InputSettings: Physical keyboard settings activity.
Abodunrinwa Toki [Wed, 23 Mar 2016 16:12:49 +0000 (16:12 +0000)]
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
am:
14df560
* commit '
14df56074435ef5cab4010d5c782fdd682509244':
InputSettings: Physical keyboard settings activity.
qinglian.x.zhang [Wed, 23 Mar 2016 16:11:06 +0000 (16:11 +0000)]
Merge "Fix no options menu on location settings screen" am:
5c15ff9
am:
178b198
* commit '
178b198f7053844576e9079c8036c5bb3d52b900':
Fix no options menu on location settings screen
qinglian.x.zhang [Wed, 23 Mar 2016 16:07:28 +0000 (16:07 +0000)]
Merge "Fix no options menu on location settings screen"
am:
5c15ff9
* commit '
5c15ff923d6116e7634e7c51cde76ce33ed77368':
Fix no options menu on location settings screen
Abodunrinwa Toki [Wed, 23 Mar 2016 16:03:23 +0000 (16:03 +0000)]
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
Geoff Mendal [Wed, 23 Mar 2016 14:55:13 +0000 (14:55 +0000)]
Import translations. DO NOT MERGE am:
9203c33 -s ours
am:
e4991bd -s ours
* commit '
e4991bd6dd3c5be6b3c1326a46b5c66a33602037':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 23 Mar 2016 14:51:17 +0000 (14:51 +0000)]
Import translations. DO NOT MERGE
am:
9203c33 -s ours
* commit '
9203c33008ba048ee306bf4c3a5548ec46004c86':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 23 Mar 2016 14:39:30 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibcc935d8f8e5e2af9746f8ba9032855017110127
Auto-generated-cl: translation import
Geoff Mendal [Wed, 23 Mar 2016 13:35:05 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39432205d099c448867c42392f9a6e574105fd43
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 23 Mar 2016 00:24:07 +0000 (17:24 -0700)]
Add more policy transparency for disallow_remove_user restriction.
Bug:
27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
Andres Morales [Tue, 22 Mar 2016 21:42:40 +0000 (21:42 +0000)]
Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev am:
950de0e
am:
130721a
* commit '
130721a419d4c99ee06c7d44e450ff8167834736':
don't toggle OEM unlocking if the preference is not enabled
Andres Morales [Tue, 22 Mar 2016 21:34:00 +0000 (21:34 +0000)]
Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev
am:
950de0e
* commit '
950de0e40aa1c21dc69c64980fa4dab2f1c68eb7':
don't toggle OEM unlocking if the preference is not enabled
Andres Morales [Tue, 22 Mar 2016 21:20:43 +0000 (21:20 +0000)]
Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev
Andres Morales [Tue, 22 Mar 2016 19:50:33 +0000 (12:50 -0700)]
don't toggle OEM unlocking if the preference is not enabled
Toggling the top-level switch is bypassing the disabled
state of the switch and leaving it in an inconsistent and
unrecoverable state.
Bug:
26863852
Change-Id: I9fed626b743fd6aac2c20910493bdec4778cc629
Abodunrinwa Toki [Tue, 22 Mar 2016 16:29:38 +0000 (16:29 +0000)]
InputSettings: Physical keyboard settings activity.
This CL adds functionality to trigger the "Physical keyboard"
settings screen via an intent.
Bug:
26943892
Change-Id: Ib4a0be38f94f83672501d5312079d132b2ab717d
Jason Monk [Tue, 22 Mar 2016 16:49:13 +0000 (16:49 +0000)]
Merge "Guard against monkey crash." into nyc-dev am:
9c867a5
am:
230a29a
* commit '
230a29a1b3989298fddea4180f41bad4617d6d10':
Guard against monkey crash.
Jason Monk [Tue, 22 Mar 2016 16:46:26 +0000 (16:46 +0000)]
Merge "Guard against monkey crash." into nyc-dev
am:
9c867a5
* commit '
9c867a5703e36f47ec0f6b52fd1dc8b7d3110802':
Guard against monkey crash.
Jason Monk [Tue, 22 Mar 2016 16:38:44 +0000 (16:38 +0000)]
Merge "Guard against monkey crash." into nyc-dev
Tony Mantler [Tue, 22 Mar 2016 16:27:56 +0000 (16:27 +0000)]
Merge "Move hint strings to SettingsLib" into nyc-dev am:
829d517
am:
1721681
* commit '
172168131a0045ecc61825cebffb3520fd1ff4eb':
Move hint strings to SettingsLib
Tony Mantler [Tue, 22 Mar 2016 16:24:49 +0000 (16:24 +0000)]
Merge "Move hint strings to SettingsLib" into nyc-dev
am:
829d517
* commit '
829d5173d881fb02289aab3e3024e2c0c98650ab':
Move hint strings to SettingsLib
Jason Monk [Tue, 22 Mar 2016 16:17:12 +0000 (09:17 -0700)]
Guard against monkey crash.
Bug:
27784445
Change-Id: I4ba6e02e0cdb6857661a824ae0888feac6762a05
Tony Mantler [Tue, 22 Mar 2016 16:16:14 +0000 (16:16 +0000)]
Merge "Move hint strings to SettingsLib" into nyc-dev
Jason Monk [Tue, 22 Mar 2016 16:15:34 +0000 (16:15 +0000)]
Merge "Fix no options menu on location settings screen"
Nathan Harold [Tue, 22 Mar 2016 02:27:18 +0000 (02:27 +0000)]
Fix Crash in the WiFi Status Test Menu am:
582b287
am:
19acb87
* commit '
19acb87506e4bc14d611fd323c75e5ccaadf142c':
Fix Crash in the WiFi Status Test Menu
Nathan Harold [Tue, 22 Mar 2016 02:24:29 +0000 (02:24 +0000)]
Fix Crash in the WiFi Status Test Menu
am:
582b287
* commit '
582b28759551413454a7bf3e5e9e919030ceca33':
Fix Crash in the WiFi Status Test Menu
Daichi Hirono [Tue, 22 Mar 2016 02:04:29 +0000 (11:04 +0900)]
Don't close USB type notification when USB is connected to USB devices.
Previously we show a notificatino to show the UsbModeChooser when
Android is connected to another Android via USB type C cable.
However UsbModeChoooser activity was closed immediately after a user
tapped the notification, if the Android worked as host.
FIXED=
27535640
Change-Id: I707dcbf1021e7381096c0ae7cc2d712892ac5a5a
Nathan Harold [Mon, 21 Mar 2016 22:13:31 +0000 (15:13 -0700)]
Fix Crash in the WiFi Status Test Menu
-Remove fragments of the defunct/removed ip-address ping test
-Update a dangling resource reference
Bug:
27771038
Change-Id: Ib26eb6427eb6fbe6ef2d1f235277af3d2e8093f1
Tony Mantler [Mon, 21 Mar 2016 21:51:55 +0000 (14:51 -0700)]
Move hint strings to SettingsLib
b/
18246360
Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
Tony Mak [Mon, 21 Mar 2016 15:28:15 +0000 (15:28 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev am:
147fa9f
am:
1a7d856
* commit '
1a7d8569840c23099bf39aadc990640f916ef516':
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
Victor Chang [Mon, 21 Mar 2016 15:28:15 +0000 (15:28 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev am:
32da1ec
am:
d0fc82f
* commit '
d0fc82fd66477a14e2f3edf646fd51321c7fa935':
Per vpn setting change in VPN list
Tony Mak [Mon, 21 Mar 2016 15:25:39 +0000 (15:25 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
am:
147fa9f
* commit '
147fa9f542a5509f64009548af221729a66138f5':
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
Victor Chang [Mon, 21 Mar 2016 15:25:39 +0000 (15:25 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev
am:
32da1ec
* commit '
32da1ecdca5e447268da5166f4a020ff9b54ab44':
Per vpn setting change in VPN list
Tony Mak [Mon, 21 Mar 2016 15:20:34 +0000 (15:20 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
Victor Chang [Mon, 21 Mar 2016 15:20:13 +0000 (15:20 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev
OSDN Git Service
