Bill Yi
15c50996c1
Merge "Revert "Import translations. DO NOT MERGE""
2016-12-05 18:40:43 +00:00
Bill Yi
11541ae9a7
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 6561ccdb99
2016-12-05 18:40:10 +00:00
Kouji Shiotani
49016583bd
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev am: 8c917322a7
...
am: 737ecc8cbc
2016-12-05 18:38:37 +00:00
Kouji Shiotani
6a9d84deaf
To enable scroll function at DatePickerDialog am: 6b04f11100
...
am: e0349a49f3
2016-12-05 18:37:39 +00:00
Bill Yi
a1b10fcdb9
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
2016-12-05 18:35:38 +00:00
Bill Yi
05ab7a37a4
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 52ae3289fb
2016-12-05 18:35:00 +00:00
Bill Yi
e6a8d3835c
Merge "Revert "Import translations. DO NOT MERGE""
2016-12-05 18:34:38 +00:00
jackqdyulei
bb6503ce6a
Add tint for invert color icon
...
Bug: 32592245
Test: Manual
Change-Id: I5c0f7e511a3bfb1c00459c595e9d518e4def5905
2016-12-05 10:34:13 -08:00
Bill Yi
e7dfc3524c
Revert "Import translations. DO NOT MERGE"
...
This reverts commit e16ad05887
2016-12-05 18:33:57 +00:00
Kouji Shiotani
737ecc8cbc
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
...
am: 8c917322a7
2016-12-05 18:31:20 +00:00
Kouji Shiotani
e0349a49f3
To enable scroll function at DatePickerDialog
...
am: 6b04f11100
2016-12-05 18:31:14 +00:00
jackqdyulei
b8fb724b84
Add tint for hotspot icon
...
Bug: 32592245
Test: Manual
Change-Id: Iac51278203404d0846f0990fd763cc00b0606d9c
2016-12-05 10:29:47 -08:00
TreeHugger Robot
8c917322a7
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
2016-12-05 18:23:57 +00:00
Michael Kwan
4b3d0ce2d4
Merge "Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 9120012566" into nyc-mr2-dev-plus-aosp
...
am: 1f5e83894e
2016-12-05 18:22:35 +00:00
Michael Kwan
4c5df8bb93
Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 9120012566
...
am: dbc5a93449
2016-12-05 18:22:27 +00:00
Michael Kwan
319cfe16f1
Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 85ba660b16
...
am: 1805ba1d76
2016-12-05 18:21:14 +00:00
Android Build Merger (Role)
1f5e83894e
Merge "Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 9120012566" into nyc-mr2-dev-plus-aosp
2016-12-05 18:16:35 +00:00
Michael Kwan
dbc5a93449
Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
...
am: 9120012566
2016-12-05 18:15:44 +00:00
Michael Kwan
1805ba1d76
Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
...
am: 85ba660b16
2016-12-05 18:14:46 +00:00
Michael Kwan
85ba660b16
Disable swipe-to-dismiss for not cancelable dialogs.
...
am: f7964be938
2016-12-05 18:09:10 +00:00
Michael Kwan
9120012566
Disable swipe-to-dismiss for not cancelable dialogs.
...
am: f7964be938
2016-12-05 18:09:07 +00:00
jackqdyulei
c48ea683eb
Add tint for cast icon
...
Bug: 32592245
Test: Manual
Change-Id: I9893f308739594540baa1720b994403070eb2bd1
2016-12-05 10:00:40 -08:00
TreeHugger Robot
014505babe
Merge "Add EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION"
2016-12-05 17:53:10 +00:00
Mahaver Chopra
849fd6f58e
Return error code from isProvisioningAllowed
...
Added hidden pre condition codes for PO and DO provsioning.
Added hidden api checkProvisioningPreCondition, which returns codes
instead of boolean. Managed provisioning can use this to show
useful debug information and user facing error dialogs.
Test: All DevicePolicyManagerTest pass
Bug: 27467633
Change-Id: I7d2a79921bc3ac2e12d506629a35563fc7ff62bf
2016-12-05 17:48:42 +00:00
Xiaohui Chen
11f1368733
Merge changes from topic 'xc_m_vertical'
...
* changes:
sysui: fix navbar button view orientation
Fix vertical nav button direction issue
2016-12-05 17:41:53 +00:00
Mahaver
fa6566e4fb
TRON variables for provisioning sessions
...
They are logged only once per provisioning session.
Test: NA
Bug: 33204472
Bug: 31425628
2016-12-05 17:21:10 +00:00
Michal Karpinski
ea98e43600
Merge "Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent"
2016-12-05 16:56:12 +00:00
Etan Cohen
fc3d4896aa
Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf am: 4c43aba36e
...
am: 4f6b7f87f8
2016-12-05 16:14:19 +00:00
Etan Cohen
4f6b7f87f8
Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf
...
am: 4c43aba36e
2016-12-05 16:08:11 +00:00
ltrochtova
40a28bcbb8
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours am: 8058dc0e82 -s ours am: ad5eb744aa -s ours
...
am: e1e2c1f1da
2016-12-05 16:04:11 +00:00
Etan Cohen
4c43aba36e
Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826
...
am: 65617f21bf
2016-12-05 16:03:44 +00:00
Etan Cohen
65617f21bf
Merge "[AWARE] Fix javadocs for match filter update"
...
am: 7241d28826
2016-12-05 15:57:37 +00:00
ltrochtova
e1e2c1f1da
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours am: 8058dc0e82 -s ours
...
am: ad5eb744aa
2016-12-05 15:57:33 +00:00
Alan Viverette
61edf5bbff
Show popup transitions when there is no anchor set
...
Allow anchorRoot to be null when starting exit transition. Pushes
epicenter callback creation into startExitTransition. Adds nullability
annotations.
Bug: 33035511
Test: PopupWindowTest#testEnterExitTransition
Change-Id: Ie752a0d6b29d5eb11c160771d8a78fa6234de5bb
2016-12-05 10:56:18 -05:00
Lenka Trochtova
8b643eb32a
Introduce a new user restriction for disallowing Bluetooth. am: 13a0519394 am: 3e149d59f9
...
am: 85bfbf1f62
2016-12-05 15:51:36 +00:00
Etan Cohen
7241d28826
Merge "[AWARE] Fix javadocs for match filter update"
2016-12-05 15:51:18 +00:00
ltrochtova
ad5eb744aa
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours
...
am: 8058dc0e82
2016-12-05 15:51:10 +00:00
ltrochtova
8058dc0e82
Merge "Introduce a new user restriction for disallowing Bluetooth."
...
am: 5fb37a7641
2016-12-05 15:44:06 +00:00
Lenka Trochtova
85bfbf1f62
Introduce a new user restriction for disallowing Bluetooth. am: 13a0519394
...
am: 3e149d59f9
2016-12-05 15:44:01 +00:00
Lenka Trochtova
3e149d59f9
Introduce a new user restriction for disallowing Bluetooth.
...
am: 13a0519394
2016-12-05 15:37:34 +00:00
ltrochtova
5fb37a7641
Merge "Introduce a new user restriction for disallowing Bluetooth."
2016-12-05 15:35:22 +00:00
Michal Karpinski
d55b731452
Unhiding network logging API
...
Unhiding network logging feature API on master in order to add CTS
tests and the like. Feature will still be CPd to MR2 as hidden.
Bug: 29748723
Change-Id: Iae3957d8e678c82b67654cd9f442436ba44ae728
2016-12-05 13:56:38 +00:00
Svetoslav Ganov
82737b42a6
Add WiFi toggle prompts - framework
...
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:28715749
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-12-05 13:52:05 +00:00
Michal Karpinski
da9d3ad3ac
Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
...
Test: the APIs will be tested by CTS when unhidden
Bug: 29748723
Change-Id: I3a029afee57b79e3ffd9ef574969ec31156b1293
2016-12-05 13:32:01 +00:00
Lenka Trochtova
63d5e4a749
Introduce a new user restriction for disallowing Bluetooth.
...
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug: 32895300
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 13:08:06 +01:00
Narayan Kamath
d291683d9f
Merge "Parcel: Add support for reading/writing lists of Parcelables."
2016-12-05 11:01:58 +00:00
Lenka Trochtova
13a0519394
Introduce a new user restriction for disallowing Bluetooth.
...
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug: 32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 11:53:34 +01:00
Jorim Jaggi
5968660525
Merge "Don't disable search on Keyguard"
2016-12-05 10:44:35 +00:00
Jorim Jaggi
6aa763bbed
Merge "Deprecate FLAG_DISMISS_KEYGUARD"
2016-12-05 10:43:50 +00:00
Tobias Thierer
57723684f4
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1 am: 6e2d3fa82f am: 386ba42ec5
...
am: 589ff8395d
2016-12-05 09:52:58 +00:00
