Fan Zhang
a2414963da
Merge "Don't return anything from setTitleFromBackStack."
2016-03-24 16:46:57 +00:00
Fan Zhang
2a7d1c3648
Don't return anything from setTitleFromBackStack.
...
The return value is not consumed by anything.
Change-Id: Id024ac02f00861aa1c7f347676c648ab406011b1
2016-03-24 09:33:43 -07:00
Daichi Hirono
e73d3cfe67
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev am: 98607d4
...
am: 28fa685
2016-03-24 02:53:04 +00:00
Daichi Hirono
28fa685ef3
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev
...
am: 98607d4
2016-03-24 02:50:52 +00:00
Daichi Hirono
98607d4449
Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev
2016-03-24 02:46:23 +00:00
Yorke Lee
fe803a7be4
Merge "Fix build" into nyc-dev am: d0f8d92
...
am: abe553e
2016-03-23 18:55:10 +00:00
Yorke Lee
abe553ed0d
Merge "Fix build" into nyc-dev
...
am: d0f8d92
2016-03-23 18:47:58 +00:00
Yorke Lee
d0f8d9257b
Merge "Fix build" into nyc-dev
2016-03-23 18:17:58 +00:00
Yorke Lee
d448522a6f
Fix build
...
Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68
2016-03-23 11:11:46 -07:00
Sudheer Shanka
62bffde1c6
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev am: 45949f9
...
am: 0f0e2df
2016-03-23 18:10:59 +00:00
Sudheer Shanka
7d1fe37af9
Merge "Add more policy transparency for wifi settings." into nyc-dev am: ed0d4dd
...
am: add53df
2016-03-23 18:10:59 +00:00
Sudheer Shanka
97c891b8ee
Merge "Add disabled by policy empty views to more screens." into nyc-dev am: 561a88c
...
am: 9ddc14e
2016-03-23 18:10:58 +00:00
Sudheer Shanka
0f0e2df40a
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
...
am: 45949f9
2016-03-23 18:06:22 +00:00
Sudheer Shanka
add53dfcb1
Merge "Add more policy transparency for wifi settings." into nyc-dev
...
am: ed0d4dd
2016-03-23 18:06:22 +00:00
Sudheer Shanka
9ddc14e7c7
Merge "Add disabled by policy empty views to more screens." into nyc-dev
...
am: 561a88c
2016-03-23 18:06:21 +00:00
Sudheer Shanka
45949f9138
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
2016-03-23 17:53:25 +00:00
Sudheer Shanka
ed0d4dd463
Merge "Add more policy transparency for wifi settings." into nyc-dev
2016-03-23 17:53:19 +00:00
Sudheer Shanka
561a88cfcd
Merge "Add disabled by policy empty views to more screens." into nyc-dev
2016-03-23 17:53:15 +00:00
Abodunrinwa Toki
0a35d8a5af
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev am: 14df560
...
am: 181b63e
2016-03-23 16:16:53 +00:00
Abodunrinwa Toki
181b63ebe0
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
...
am: 14df560
* commit '14df56074435ef5cab4010d5c782fdd682509244':
InputSettings: Physical keyboard settings activity.
2016-03-23 16:12:49 +00:00
qinglian.x.zhang
94451eacb4
Merge "Fix no options menu on location settings screen" am: 5c15ff9
...
am: 178b198
2016-03-23 16:11:06 +00:00
qinglian.x.zhang
178b198f70
Merge "Fix no options menu on location settings screen"
...
am: 5c15ff9
2016-03-23 16:07:28 +00:00
Abodunrinwa Toki
14df560744
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
2016-03-23 16:03:24 +00:00
Geoff Mendal
002cd11e96
Import translations. DO NOT MERGE am: 9203c33 -s ours
...
am: e4991bd
2016-03-23 14:55:13 +00:00
Geoff Mendal
e4991bd6dd
Import translations. DO NOT MERGE
...
am: 9203c33
2016-03-23 14:51:17 +00:00
Geoff Mendal
9203c33008
Import translations. DO NOT MERGE
...
Change-Id: Ibcc935d8f8e5e2af9746f8ba9032855017110127
Auto-generated-cl: translation import
2016-03-23 07:39:30 -07:00
Geoff Mendal
a5421e8f38
Import translations. DO NOT MERGE
...
Change-Id: I39432205d099c448867c42392f9a6e574105fd43
Auto-generated-cl: translation import
2016-03-23 06:35:05 -07:00
Sudheer Shanka
b5c92147ce
Add more policy transparency for disallow_remove_user restriction.
...
Bug: 27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
2016-03-22 17:24:07 -07:00
Andres Morales
5ca4f4ef79
Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev am: 950de0e
...
am: 130721a
2016-03-22 21:42:40 +00:00
Andres Morales
130721a419
Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev
...
am: 950de0e
2016-03-22 21:34:00 +00:00
Andres Morales
950de0e40a
Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev
2016-03-22 21:20:43 +00:00
Andres Morales
0bb6f70a87
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
2016-03-22 12:56:29 -07:00
Abodunrinwa Toki
b28b2cc68f
InputSettings: Physical keyboard settings activity.
...
This CL adds functionality to trigger the "Physical keyboard"
settings screen via an intent.
Bug: 26943892
Change-Id: Ib4a0be38f94f83672501d5312079d132b2ab717d
2016-03-22 17:17:41 +00:00
Jason Monk
64d39af2ca
Merge "Guard against monkey crash." into nyc-dev am: 9c867a5
...
am: 230a29a
2016-03-22 16:49:13 +00:00
Jason Monk
230a29a1b3
Merge "Guard against monkey crash." into nyc-dev
...
am: 9c867a5
2016-03-22 16:46:26 +00:00
Jason Monk
9c867a5703
Merge "Guard against monkey crash." into nyc-dev
2016-03-22 16:38:44 +00:00
Tony Mantler
1890a9bca8
Merge "Move hint strings to SettingsLib" into nyc-dev am: 829d517
...
am: 1721681
2016-03-22 16:27:56 +00:00
Tony Mantler
172168131a
Merge "Move hint strings to SettingsLib" into nyc-dev
...
am: 829d517
2016-03-22 16:24:49 +00:00
Jason Monk
decc767f26
Guard against monkey crash.
...
Bug: 27784445
Change-Id: I4ba6e02e0cdb6857661a824ae0888feac6762a05
2016-03-22 09:17:12 -07:00
Tony Mantler
829d5173d8
Merge "Move hint strings to SettingsLib" into nyc-dev
2016-03-22 16:16:14 +00:00
Jason Monk
5c15ff923d
Merge "Fix no options menu on location settings screen"
2016-03-22 16:15:34 +00:00
Nathan Harold
63859ab2c0
Fix Crash in the WiFi Status Test Menu am: 582b287
...
am: 19acb87
2016-03-22 02:27:18 +00:00
Nathan Harold
19acb87506
Fix Crash in the WiFi Status Test Menu
...
am: 582b287
2016-03-22 02:24:29 +00:00
Daichi Hirono
0f6796284b
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
2016-03-22 11:04:29 +09:00
Nathan Harold
582b287595
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
2016-03-21 23:22:55 +00:00
Tony Mantler
50124b5fee
Move hint strings to SettingsLib
...
b/18246360
Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
2016-03-21 14:51:55 -07:00
Tony Mak
b70f3b03e5
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev am: 147fa9f
...
am: 1a7d856
2016-03-21 15:28:15 +00:00
Victor Chang
f2ad4b1ffd
Merge "Per vpn setting change in VPN list" into nyc-dev am: 32da1ec
...
am: d0fc82f
2016-03-21 15:28:15 +00:00
Tony Mak
1a7d856984
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
...
am: 147fa9f
2016-03-21 15:25:39 +00:00
Victor Chang
d0fc82fd66
Merge "Per vpn setting change in VPN list" into nyc-dev
...
am: 32da1ec
2016-03-21 15:25:39 +00:00
