Benjamin Franz
482bb2343f
Remove 'unused' import
...
Unused import android.provider.Settings previously caused checkstyle
script to bark on DevicePolicyManager. Remove the import and update all
usages of it in javadocs.
Bug: 37890361
Test: make docs
Change-Id: I3134d97274b2882060f5172170517ce501d5aafd
2017-06-23 13:49:36 +01:00
Kevin Chyn
a2053ecf70
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev am: 6eacc1a4ba
...
am: 3164bf6743
Change-Id: I30ba4eac86bc92ac8013840f80a3645efba64d3e
2017-06-14 02:00:29 +00:00
Kevin Chyn
3164bf6743
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
...
am: 6eacc1a4ba
Change-Id: I16bac560e1ef3c20830f4bc79dca772da20032e7
2017-06-14 01:53:02 +00:00
Kevin Chyn
6eacc1a4ba
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
2017-06-14 01:43:52 +00:00
TreeHugger Robot
2d84bdcaea
Merge "Expose USER_SETUP_COMPLETE as Test API."
2017-06-14 01:37:37 +00:00
Eugene Susla
bc27890991
Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e am: c26f789ae2
...
am: dfa5272295
Change-Id: Ic68002087eacf339356e13e10698d88e1ff30c40
2017-06-14 00:39:58 +00:00
Eugene Susla
dfa5272295
Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e
...
am: c26f789ae2
Change-Id: Ice5843da51415f87140a6311415a7074b155cdb3
2017-06-14 00:24:12 +00:00
Eugene Susla
c26f789ae2
Merge "Support associating with an already-paired device" into oc-dev
...
am: c041c7a34e
Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e
2017-06-14 00:17:25 +00:00
Eugene Susla
99f209be12
Merge "Support associating with an already-paired device" into oc-dev
...
am: c041c7a34e
Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2
2017-06-14 00:17:19 +00:00
TreeHugger Robot
c041c7a34e
Merge "Support associating with an already-paired device" into oc-dev
2017-06-14 00:03:53 +00:00
Todd Kennedy
85b5ca67f1
Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: 80b761b6db
...
am: 7ad9b0bbd4
Change-Id: Iead9bfc153bfffd43d3d0f3cf68f066cedf4931c
2017-06-13 23:16:55 +00:00
TreeHugger Robot
333f15c432
Merge "Making action MANAGE_UNKNOWN_APP_SOURCES non-optional"
2017-06-13 22:58:08 +00:00
Todd Kennedy
7ad9b0bbd4
Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6
...
am: 80b761b6db
Change-Id: I0a2f3b0318b75bd08b8dfa1db1658930617333c1
2017-06-13 22:46:41 +00:00
Todd Kennedy
80b761b6db
Merge "Save overlay paths as user state" into oc-dev
...
am: 508a5bade6
Change-Id: Icba76fbeef9f4cd2a067fafd65c750f1f95a4ed0
2017-06-13 22:39:56 +00:00
Todd Kennedy
b692f4a095
Merge "Save overlay paths as user state" into oc-dev
...
am: 508a5bade6
Change-Id: If46b58323883dcdeef72f0a394f79becca134c23
2017-06-13 22:39:40 +00:00
TreeHugger Robot
4cb3ae605c
Merge "Add accessibility titles to PopupWindow"
2017-06-13 19:35:56 +00:00
Todd Kennedy
b274947dfb
Save overlay paths as user state
...
Instead of maintaining a separate structure just for overlay
paths, store them as user state in the package setting. Also
centralize updating the overlay paths to avoid issues with
inconsistent updates.
Fixes: 36561125
Test: Manual
Change-Id: Iac1c987e8650074dbc564e332d5da1950fad6ac5
2017-06-13 12:05:44 -07:00
Eugene Susla
02228bd9e6
Merge "Serialize all standard actions as bit mask"
2017-06-13 18:14:35 +00:00
Jeff Sharkey
52feccbf41
Merge "Revert "Hide APIs not intended to ship in DR.""
2017-06-13 17:40:58 +00:00
TreeHugger Robot
57fef233c8
Merge "BatteryStats: Cleanup external stats collection"
2017-06-13 17:29:15 +00:00
Tomasz Wasilczyk
9045e5d226
Merge "Implement remaining ITunerCallback methods."
2017-06-13 15:42:24 +00:00
Narayan Kamath
715073c998
Merge "BatteryStatsImpl: Keep less history around for low mem devices."
2017-06-13 11:38:47 +00:00
Narayan Kamath
2d63fa5dd0
Merge "LocalLog: Use LocalDateTime.now() instead of a Calendar."
2017-06-13 10:39:09 +00:00
Wale Ogunwale
02bdcc0e69
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9 am: 90159a2492" into oc-dr1-dev-plus-aosp
...
am: e17ea3eb21
Change-Id: I244f3d4af910c73b4c402dd0e93d92bd6ead849e
2017-06-13 01:38:47 +00:00
Robert Carr
5eadb343c3
Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: 2fa5800da9" into oc-dr1-dev-plus-aosp
...
am: 3c63cef6bf
Change-Id: I949b09e52f82ae947789489cff5cffc94d438a68
2017-06-13 01:13:37 +00:00
Wale Ogunwale
a5e833e846
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9
...
am: 90159a2492
Change-Id: I0092411f5b8bef853b55e6ffe7bdf700876f7715
2017-06-13 01:08:25 +00:00
Phil Weaver
5476da968f
Add accessibility titles to PopupWindow
...
Adding a default title and a hidden API to customize
the title.
Bug: 30177642
Test: With TalkBack running, navigate to Settings->
Network & Internet. Select the more options button and
double-tap to select it. It now announces "Popup Window".
Change-Id: I38591a25be0fe1d5bf57c9edee29f09c92e258ea
2017-06-12 18:02:09 -07:00
Wale Ogunwale
5323b2d4cd
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
...
am: e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
2017-06-13 01:01:51 +00:00
Jeff Sharkey
a915a88cfb
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: f96c9a0fa2" into oc-dr1-dev-plus-aosp
...
am: 08b598fcfe
Change-Id: I6dd330a240f1725b59e79111fd3bfc124a3fb897
2017-06-13 00:57:38 +00:00
Robert Carr
aec6b4749a
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
...
am: 42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
2017-06-13 00:54:10 +00:00
Vladislav Kaznacheev
b7431e4376
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: 7e21054200" into oc-dr1-dev-plus-aosp
...
am: 4c4cf27212
Change-Id: Ibef05a31f18d50b5460af1c23f676e061ad81e6c
2017-06-13 00:49:47 +00:00
Robert Carr
cb6196277f
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc
...
am: 2fa5800da9
Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a
2017-06-13 00:43:56 +00:00
Will Brazil
a8e2ba8efd
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 5884f6ce0d
...
am: 308a19531e
Change-Id: I2db2e50ac8ca7b85429271eb649a2698041d1df0
2017-06-13 00:36:59 +00:00
Jeff Sharkey
0ba24ed694
Merge "Improve developer docs for storage APIs." into oc-dev
...
am: 05b52d8ba5
Change-Id: I282786d353e3dc406c7123daa00d3e7fe43de7bc
2017-06-13 00:36:09 +00:00
Jeff Sharkey
10e0b425bc
Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5
...
am: f96c9a0fa2
Change-Id: Ifef4156412f88e1d7bc3d8bbccaca6d0177c7245
2017-06-13 00:35:13 +00:00
Vladislav Kaznacheev
6fa65bbdd6
Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86
...
am: 7e21054200
Change-Id: Icfe6bb79c13c6e0ef925f30933f7831978a2886c
2017-06-13 00:32:20 +00:00
Vladislav Kaznacheev
bc168cf9d5
Merge changes from topic 'sysui-tooltip' into oc-dev
...
am: 3fbcec5b86
Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b
2017-06-13 00:31:02 +00:00
Will Brazil
308a19531e
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631
...
am: 5884f6ce0d
Change-Id: I725739aed3207992022aa500bb99072410a9a305
2017-06-13 00:26:49 +00:00
Jeff Sharkey
dc292b6003
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev am: f7dc56ecc9
...
am: de624f3fbb
Change-Id: I0a125a6c00220ba280dca4e0d8ece88202a68afe
2017-06-13 00:24:59 +00:00
Will Brazil
938fe5c968
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
...
am: 71029bf631
Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae
2017-06-13 00:24:40 +00:00
Jeff Sharkey
de624f3fbb
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
...
am: f7dc56ecc9
Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
2017-06-13 00:14:55 +00:00
Tarandeep Singh
b8b6f00b75
Merge "SearchView focus should be preserved in split-screen."
2017-06-13 00:12:08 +00:00
Jeff Sharkey
f7dc56ecc9
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
2017-06-13 00:09:50 +00:00
Wale Ogunwale
90159a2492
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
...
am: e1e0db8ca9
Change-Id: Ie70addce27b9551323d7c9d8f9576aa118b98114
2017-06-13 00:02:11 +00:00
Wale Ogunwale
e1e0db8ca9
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
2017-06-12 23:51:19 +00:00
Robert Carr
2fa5800da9
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
...
am: 42b3610adc
Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba
2017-06-12 23:45:37 +00:00
TreeHugger Robot
42b3610adc
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
2017-06-12 23:38:19 +00:00
Anthony Chen
de3c5a25b6
Merge "Handle night mode for notifications."
2017-06-12 23:27:57 +00:00
Eugene Susla
0c4a926626
Support associating with an already-paired device
...
This is required for migration scenario, where device(s) are already
paired(and thus no longer discoverable) but didn't go through companion
flow.
This also fixes a bug with filtering by mac address, which is also relevant to
the use-case of associating a specific device
Test: Pair with a device first, and call associate with a filter with its MAC
address and single device requested. Ensure the device is found.
Ensure only that device is ever returned when filtering by MAC address.
Bug: 62487084
Change-Id: Ic7cc6affc0648ad85b15620e8c3aba4b9fc91aa1
2017-06-12 16:21:51 -07:00
Kevin Chyn
809393740f
Add assist gesture silence and wake settings
...
Bug: 37427306
Test: make -j56
Change-Id: I36da4d689a2aecf0cdd5e0549ede6d3e31f0e630
2017-06-12 16:02:28 -07:00