Daniel Estrada Alva
aa8060df8c
am 08c04874: am f3349406: am 243095c9: am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
...
* commit '08c0487487ed77d25f2b0593cb3aba31b2b3fe57':
Disable AR HW when client binder dies.
2015-08-27 05:11:58 +00:00
Fyodor Kupolov
2170ee43a1
Merge "Limit the number of apps running as system user"
2015-08-26 22:14:36 +00:00
Daniel Estrada Alva
08c0487487
am f3349406: am 243095c9: am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
...
* commit 'f33494069fd914868ed32effe753b649e86e20d2':
Disable AR HW when client binder dies.
2015-08-26 21:34:18 +00:00
Alan Viverette
bd1d652f37
am 8d8c53df: am 76c73ae4: am 12874d2d: am b9b57225: am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
...
* commit '8d8c53df26ac29fa3c6df782eb49e8d50683a1dd':
Avoid NPE when getPositionForView() is called on detached view
2015-08-26 21:23:45 +00:00
Daniel Estrada Alva
243095c9ca
am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
...
* commit '47ee2ecf82958f211c775a4125968fbf505fe594':
Disable AR HW when client binder dies.
2015-08-26 21:19:53 +00:00
Alan Viverette
8d8c53df26
am 76c73ae4: am 12874d2d: am b9b57225: am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
...
* commit '76c73ae495fe9bad5ed51b96cd8e509dbb8de46f':
Avoid NPE when getPositionForView() is called on detached view
2015-08-26 21:13:04 +00:00
Chien-Yu Chen
8af9d7687d
am fcfa1d57: am 2aa23ac6: am aebc3cce: am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'fcfa1d57ea6ab245095d3ab1fcef103fa0abcd83':
Camera: Update for reprocess session
2015-08-26 21:12:03 +00:00
Daniel Estrada Alva
47ee2ecf82
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
2015-08-26 21:09:50 +00:00
Seigo Nonaka
2041ffb8b5
Merge "Introduce simple SuggestionsPopupWindowTest."
2015-08-26 21:06:58 +00:00
Alan Viverette
12874d2de4
am b9b57225: am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
...
* commit 'b9b57225c28cdec5a8b7c2a6353f40a66010c0ed':
Avoid NPE when getPositionForView() is called on detached view
2015-08-26 20:56:42 +00:00
Alan Viverette
b9b57225c2
am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
...
* commit '9513785715e2325ee3a3269fbfe7b1f4409eff5c':
Avoid NPE when getPositionForView() is called on detached view
2015-08-26 20:45:26 +00:00
Alan Viverette
9513785715
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
2015-08-26 20:38:53 +00:00
Chien-Yu Chen
fcfa1d57ea
am 2aa23ac6: am aebc3cce: am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit '2aa23ac6ee34b69c37ece2c40b9511c5a53bb01e':
Camera: Update for reprocess session
2015-08-26 19:29:42 +00:00
Alan Viverette
898c7045e0
Avoid NPE when getPositionForView() is called on detached view
...
Bug: 23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
2015-08-26 15:22:09 -04:00
Chien-Yu Chen
aebc3cce3c
am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'fd059b34fa81552934a194f845f114d1d89f87db':
Camera: Update for reprocess session
2015-08-26 19:15:49 +00:00
Chien-Yu Chen
fd059b34fa
am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
2015-08-26 19:07:52 +00:00
Chien-Yu Chen
e4c3ff2f50
Merge "Camera: Update for reprocess session" into mnc-dev
2015-08-26 18:56:15 +00:00
Julia Reynolds
8ef94501f0
Merge "Allow third party condition providers."
2015-08-26 18:46:26 +00:00
Daniel Estrada Alva
28fa6705bd
am e4d61989: am f440fe06: am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
...
* commit 'e4d61989aebaee02b8b83f229418e7744278633f':
Cherry-pick: Add callback-based support for HW Activity Recognition.
2015-08-26 17:56:18 +00:00
Daniel Estrada Alva
f440fe06f5
am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
...
* commit '8ff73b596e7c59f32a3f0df503ae8a9e5adbced5':
Cherry-pick: Add callback-based support for HW Activity Recognition.
2015-08-26 17:37:15 +00:00
Daniel Estrada Alva
8ff73b596e
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
2015-08-26 17:30:09 +00:00
Fyodor Kupolov
d3a182e573
Merge "Renamed primaryUserOnly to systemUserOnly"
2015-08-26 17:25:51 +00:00
Fyodor Kupolov
7db5af124e
Limit the number of apps running as system user
...
For the system user, enable apps based on the following conditions:
- app has no launcher icons or has INTERACT_ACROSS_USER_FULL permission
- app is whitelisted
- app is not in the blacklist
Bug: 23283899
Change-Id: I90fa266e8cfb28d002e5f792998fdddb6a1e6969
2015-08-26 10:18:10 -07:00
Alan Viverette
b2d48bc5cc
Merge "Revert "Revert "View measurement optimization"""
2015-08-26 16:53:19 +00:00
Alan Viverette
e2acc5e283
Revert "Revert "View measurement optimization""
...
Refactors for readability and adds an API >M check to be compatible with
the LinearLayout fix that also targets API >M.
This revert commit reverts revert commit
9d8a230fbd
which originally reverted commit
9cefbda11e .
Change-Id: I587d733abef0b35a1bb14b6272054322494a7cdd
2015-08-26 11:17:17 -04:00
Alan Viverette
9fb7c022b5
Merge "Add documentation on View for android:theme and <tag> element"
2015-08-26 14:33:00 +00:00
Yasuhiro Matsuda
92386c42a8
Merge "Broadcast ACTION_USB_STATE only if necessary."
2015-08-26 09:36:40 +00:00
Fyodor Kupolov
4f5de340c9
Renamed primaryUserOnly to systemUserOnly
...
In the split mode, broadcast receivers and activities marked as
systemUserOnly will be running as system. This is a non-functional change for
non-split system user mode.
Bug: 22958572
Change-Id: I0f7d4f4a81275bc326bf630a776c695e8b5291a6
2015-08-25 18:26:49 -07:00
Alan Viverette
4e64974998
Merge "Correctly distribute weight to pre-measured zero-dimension views"
2015-08-25 21:19:41 +00:00
Alan Viverette
40e1df34a9
Correctly distribute weight to pre-measured zero-dimension views
...
Previously, the measurements obtained from LinearLayout when using
EXACTLY and AT_MOST modes would be different even if the resulting
height was the same. This was the result of non-EXACTLY measurement
accounting for the size of zero-dimension views and then redistrib-
uting space as though they had initally been set as AT_MOST, whereas
EXACTLY would always redistribute space as though they had initially
been set as zero-dimension.
Makes perfect sense, right?
This CL updates non-EXACTLY measurement to always calculate the
minimum dimensions requested by zero-dimension views, but then to
redistribute the space according to weight.
Bug: 22810327
Change-Id: Iba8a3d26f2724e5fa9a30457119b4564eb285edb
2015-08-25 16:50:27 -04:00
Seigo Nonaka
e3e7b52324
Merge "Leverage WindowManagerInternal for private communication."
2015-08-25 20:42:25 +00:00
Seigo Nonaka
7309b123c4
Leverage WindowManagerInternal for private communication.
...
This CL changes following four methods from direct calling of
WindowManagerService to calling via WindowManagerInternal.
- getInputMethodWindowVisibleHeight
(introduced by I0e920ee79c526c3aea6872b063cf294e2ab081c8)
- saveLastInputMethodWindowForTransition
(introduced by Idf7700271cf882dfbf35c9d16f0f173a791221bc)
- isHardKeyboardAvailable
(introduced by I8a6a4a7efce50bfaec114117e33f97f27b1ef950)
- setOnHardKeyboardStatusChangeListener
(introduced by Ica768083f95c33dc1e494a28ba7d8b6eb989b0ef)
This CL does mechanical code moving and does not change any behaviors.
Bug: 22285167
Change-Id: I08e506050a0e495d62236b46e487848c967d185d
2015-08-25 13:29:04 -07:00
Julia Reynolds
b0a773f6b3
Allow third party condition providers.
...
Bug: 22977552
Change-Id: I3d8689f52daa9376496e14997a6dd7862fb3ade6
2015-08-25 15:01:22 -04:00
Alan Viverette
77a4d4340f
Merge "Clean up ContextThemeWrapper"
2015-08-25 18:58:43 +00:00
Alan Viverette
866fd68079
Merge "Return asset manager with correct config from ContextThemeWrapper"
2015-08-25 18:58:23 +00:00
Chien-Yu Chen
e90c6d0ad2
Camera: Update for reprocess session
...
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.
Bug: 23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
2015-08-25 11:58:21 -07:00
Alan Viverette
0c8623c631
Add documentation on View for android:theme and <tag> element
...
The android:theme attribute itself is already documented in attrs.xml.
Bug: 23028410
Change-Id: I0543952395b5bf099d57d0799f814f38f74ae7b0
2015-08-25 14:50:20 -04:00
Alan Viverette
04067f33c8
Clean up ContextThemeWrapper
...
Fix trailing white space, use of final, comments.
Change-Id: Iacc034acd46a651c35c32f2efbc0fe5fb58e1209
2015-08-25 14:07:02 -04:00
Dmitry Polukhin
91b3d8bf24
Merge "[Backup] Special handling for sharedpref files in backup config"
2015-08-25 18:06:15 +00:00
Alan Viverette
e188fcc283
Merge "Pass Resources when loading ImageView source from stream"
2015-08-25 17:50:29 +00:00
Alan Viverette
99bf63fdaf
Return asset manager with correct config from ContextThemeWrapper
...
Bug: 23416037
Change-Id: Ia87bebbe6f23214c892bc2ca19d4112853023235
2015-08-25 13:45:38 -04:00
Alan Viverette
8c0a4d0f8b
Merge "Clean up ImageView"
2015-08-25 17:40:02 +00:00
Alan Viverette
270a34280e
Pass Resources when loading ImageView source from stream
...
Only targets >M since developers may have already had workarounds in
place or been relying on the incorrect behavior.
Bug: 23383805
Change-Id: Ifa69b204b10b8084cf6486e41d5393969e197826
2015-08-25 13:25:16 -04:00
Alan Viverette
6aa92d1cfa
Clean up ImageView
...
Refactors ImageView to use LOG_TAG constant, fixes indentation, trailing
whitespace, uses of final. No functional changes.
Change-Id: I9e67d9a152e1c6d646719afa5010c45868db9c6f
2015-08-25 13:19:25 -04:00
Alan Viverette
53b165ea54
Hide SearchView icon when no drawable set
...
Bug: 23511899
Change-Id: Ic2a4622f905779fc713482c60706c727274f9be5
2015-08-25 12:33:01 -04:00
Eino-Ville Talvala
170e089551
am d9a24b1b: am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd9a24b1b907fabc76a9c4bdc07ac26b6959db811':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-25 00:46:50 +00:00
Eino-Ville Talvala
b8079c5c49
am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 23:39:22 +00:00
Eino-Ville Talvala
d9a24b1b90
am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd7f3dfb7c8f40308a95a56f90ef7a1157897cce6':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:38:17 +00:00
Eino-Ville Talvala
cd05509a81
am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '6393275f5f8daa2d14dbc3fbd6511a78978999cd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:21:16 +00:00
Eino-Ville Talvala
6393275f5f
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:16 +00:00