Commit Graph

47694 Commits

Author SHA1 Message Date
Ruben Brunk
af64c8708f am 5ca56590: am 8df59ed6: am 0a323036: Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev
* commit '5ca565904c4a1acccf308f1cbd3f3cbfaaea6256':
  Revert "camera: Start/stop preview before clearing surface."
2015-05-07 05:39:50 +00:00
Seigo Nonaka
2f786847a7 am 47d2753a: am 98b14c46: am 06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev
* commit '47d2753a3b629011e31f43f953290ecd0a6b8c6a':
  Always show auxiliary subtypes from NavBar keyboard icon.
2015-05-07 05:39:40 +00:00
Ruben Brunk
0a323036e2 Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev 2015-05-06 21:02:36 +00:00
Seigo Nonaka
06bdf9c6a6 Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev 2015-05-06 20:31:19 +00:00
Seigo Nonaka
80ff4ed6bb Always show auxiliary subtypes from NavBar keyboard icon.
The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994

Change-Id: I1e50ee42838a1bf64a612da4904aa93458d44ea4
2015-05-06 20:29:05 +00:00
Alan Viverette
6e4b9c29f8 am 5f3f0bc9: am 2ad4206e: am 4d5c20c6: Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev
* commit '5f3f0bc9b445afd297fab015f18d976eff890eb0':
  ListPopupWindow should use window layout type SUB_PANEL
2015-05-06 17:55:55 +00:00
Alan Viverette
8876e44449 am 14823d60: am 72a04431: am 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev
* commit '14823d609aa66cf2980a7be0c613897752bd332a':
  Add scroll indicators on View, use in AlertDialog
2015-05-06 17:51:09 +00:00
Benjamin Franz
d4ea8f7924 am 9c400eb8: am 8fb2d472: am 94fb2024: Merge "Rename functions that disable status bar and keyguard" into mnc-dev
* commit '9c400eb8aca527c9d1fc698c8a740eafe4d58c3d':
  Rename functions that disable status bar and keyguard
2015-05-06 17:42:46 +00:00
Clara Bayarri
801386147f am 385d59e4: am c3a0d0b0: am fbb34dd8: Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev
* commit '385d59e43c42d3ba54115af8f8ea29bcb1d83e45':
  Allow Floating ActionModes in SearchDialog.
2015-05-06 17:42:27 +00:00
Alan Viverette
4d5c20c613 Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev 2015-05-06 17:24:31 +00:00
Alan Viverette
922e1c6ed2 Add scroll indicators on View, use in AlertDialog
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.

Bug: 19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
2015-05-06 10:09:35 -07:00
Benjamin Franz
94fb2024b0 Merge "Rename functions that disable status bar and keyguard" into mnc-dev 2015-05-06 15:16:20 +00:00
Benjamin Franz
bece80645e Rename functions that disable status bar and keyguard
Rename the DevicePolicyManager functions setKeyguardEnabledState and
setStatusBarEnabledState to setKeyguardDisabled and
setStatusBarDisabled respectively.

Bug: 20820039
Change-Id: I06f6a19ac55b24e66e9f2cb340ead5d940cb2235
2015-05-06 13:19:22 +01:00
Clara Bayarri
fbb34dd8df Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev 2015-05-06 09:10:27 +00:00
Prerepa Viswanadham
5af99614f2 Merge "Make onlost/onfound APIs public" 2015-05-06 01:15:00 +00:00
John Spurlock
f733ac5bf0 am 08e1fc30: am aca04f6a: am bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev
* commit '08e1fc30cb0d9c37a9b1bae70a8b051ae9ac2948':
  Zen: Maintain source filters for both calls and messages.
2015-05-06 01:05:44 +00:00
Prerepa Viswanadham
d3df86e5f0 Make onlost/onfound APIs public
Change-Id: I455124478d953d652f216f71d5813782fc9633ab
2015-05-05 17:56:38 -07:00
Selim Cinek
b9040caa63 am 1762af03: am e948bfeb: am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
* commit '1762af0307930942cfec3b2ad6dd7f6a8663b2b6':
  The voice assist may now be launched above the lockscreen
2015-05-06 00:45:09 +00:00
John Spurlock
bc1a2ad878 Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev 2015-05-06 00:30:26 +00:00
Selim Cinek
6329bbceeb Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 2015-05-05 23:52:35 +00:00
John Spurlock
a492d1d88c Zen: Maintain source filters for both calls and messages.
Bug: 18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22
2015-05-05 18:45:42 -04:00
Cheuksan Wang
f657b9969d add a parameter to carrier messaging calls to request delivery status
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.

BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
2015-05-05 15:24:18 -07:00
Chris Craik
629f9c715c am 8fffd604: am 217ade77: am 356b1777: Merge "Cleanup properties" into mnc-dev
* commit '8fffd6045d0eb27fbd6e894f6eee9818cda973bc':
  Cleanup properties
2015-05-05 22:03:13 +00:00
Selim Cinek
e70d653523 The voice assist may now be launched above the lockscreen
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
2015-05-05 14:52:52 -07:00
Chris Craik
356b177709 Merge "Cleanup properties" into mnc-dev 2015-05-05 21:30:08 +00:00
Jorim Jaggi
9a284f53f7 am 4eca7067: am 3bf26f1d: am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
* commit '4eca70673174c684de4a337d738660b6c1988dfc':
  Only enable fingerprint auth after first regular auth
2015-05-05 21:11:57 +00:00
Jorim Jaggi
5be4d295c0 Merge "Only enable fingerprint auth after first regular auth" into mnc-dev 2015-05-05 20:51:18 +00:00
Raph Levien
9985ca8788 am 37360dd4: am 8d736c1c: am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
* commit '37360dd4c770c5c0bfa61a5992c98d7461402fc6':
  Fix NPE in Html.inParagraph()
2015-05-05 19:24:09 +00:00
Julia Reynolds
af491c6b24 am ac032058: am 16d4d46a: am 9e540a51: Merge "Fixing docs." into mnc-dev
* commit 'ac032058c54d456011c154df4e465b955c7f7706':
  Fixing docs.
2015-05-05 19:24:04 +00:00
Alan Viverette
aacb91d57d am 0de8c44a: am 4a207c4f: am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
* commit '0de8c44a7497d79f9e21a4713061c0e74bd5ccae':
  Add API for obtaining changing configurations bitmask from Theme
2015-05-05 19:23:43 +00:00
Todd Kennedy
19cc03a178 am 170f0406: am 2e22cec8: am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
* commit '170f0406021e7ef2d9a9735506171e2dc6e4720d':
  Call Activity#onAttachFragment()
2015-05-05 19:23:31 +00:00
Svet Ganov
b0a09de819 am 4e2029c0: am 2514a265: am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
* commit '4e2029c058966f30a71b1bcea16aa65a5d7f85c4':
  Permission UI - legacy apps support
2015-05-05 19:23:20 +00:00
John Spurlock
fba7c4eadc am aac2806e: am 0c9c89a1: am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
* commit 'aac2806e085eda5e91c0c5d1ea67de889314f2f0':
  Zen: Remove calendar rule attendance attribute.
2015-05-05 19:23:09 +00:00
Jorim Jaggi
237b061182 Only enable fingerprint auth after first regular auth
- Add method hasUserAuthenticatedSinceBoot to TrustManagerService
- Use this information to only enable fingerprint auth after the user
has at least once authenticated with his regular authentication
method.

Change-Id: Icf073ac3b340d557b044f6bf27f1a7f8511048e2
2015-05-05 11:43:42 -07:00
Raph Levien
be8db11972 Merge "Fix NPE in Html.inParagraph()" into mnc-dev 2015-05-05 17:43:30 +00:00
Chris Craik
2507c34d91 Cleanup properties
bug:19967854

Separate properties from Caches, into static, RenderThread-only class.

Also rewrites the means for java to set properties to correctly handle
threading, and adds an override for profile bars so that SysUi doesn't clutter
the screen with them.

Change-Id: I6e21a96065f52b9ecc49d1a126244804ba106fa9
2015-05-05 10:36:09 -07:00
Julia Reynolds
2f46d949e2 Fixing docs.
Bug: 20823970
Bug: 20820224
Change-Id: If6b5c43ae5cf88bd5a09adc60c1204ba9e6ab459
2015-05-05 13:19:52 -04:00
Raph Levien
8e71a397c6 Fix NPE in Html.inParagraph()
The typeface in a TypefaceSpan can be the null string. This patch
fixes the string comparison to not throw a NullPointerException.

Bug: 20849738
Change-Id: Ied049305794966bcbca00cfd11fe97a91b685d79
2015-05-05 10:13:54 -07:00
Alan Viverette
261208e002 Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev 2015-05-05 16:50:29 +00:00
Alan Viverette
c1d527926e Add API for obtaining changing configurations bitmask from Theme
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
2015-05-05 09:49:03 -07:00
Todd Kennedy
3266f60ba0 Merge "Call Activity#onAttachFragment()" into mnc-dev 2015-05-05 15:53:29 +00:00
Svet Ganov
4a64b19f23 Merge "Permission UI - legacy apps support" into mnc-dev 2015-05-05 15:34:10 +00:00
Svet Ganov
019d230499 Permission UI - legacy apps support
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
2015-05-05 08:33:04 -07:00
John Spurlock
0bc8afff7e Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev 2015-05-05 14:42:03 +00:00
Niels Egberts
100860736e Merge "Don't strip country and variant from locale." 2015-05-05 13:54:13 +00:00
John Spurlock
d39af2d3f8 Zen: Remove calendar rule attendance attribute.
- No longer supporting a filter based on attendance type.
 - Remove from model + condition provider logic.

Bug: 20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05
2015-05-05 09:49:32 -04:00
Tingting Wang
830e158d99 Merge "Add metadata_dirty column to ContactsContract." 2015-05-05 01:41:54 +00:00
Andre Eisenbach
0b9c3610b0 am 112f177c: am 7e66f6f4: am ab258139: BluetoothSap class should not be public
* commit '112f177c2587fc3ba36bba0f5a7a7dcbb131ef13':
  BluetoothSap class should not be public
2015-05-05 01:37:36 +00:00
George Mount
1418da5365 am fa8cd17a: am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev
* commit 'fa8cd17a4064f8293b4bbae379769d6e63e0ac4b':
  Fix potential NPE in internal isValidTarget method.
2015-05-05 01:36:57 +00:00
Andre Eisenbach
5e60b79e39 am 123bbd5a: am 621b790d: am f455986a: Add documentation for BluetoothSocket.getConnectionType()
* commit '123bbd5aef25d42bf3bf1ea84ccd8d0c08229363':
  Add documentation for BluetoothSocket.getConnectionType()
2015-05-05 01:36:50 +00:00