Adrian Roos
8f21158fe6
Trust: Make setEnabledFeatures asynchronous
...
Unsynchronizes the call into app code from setEnabledFeatures,
replacing it with a callback mechanism. Also makes this actually
work by fixing the check in TrustManagerService to take into account
whitelisting.
Change-Id: I0831752cd2d3158eda9c8404a5569498f11ac2ac
2014-07-30 12:34:18 +00:00
Adrian Roos
7861c663fd
Add setManagingTrust and expose it on lockscreen
...
Adds a facility for trust agents to indicate if they
are ready to manage trust. Also adds an indication to
the lock icon on the lockscreen to show whether trust is
being managed.
Bug: 15518469
Bug: 16123013
Change-Id: Ie17f588aebeafe66c81dea4a69c733b0d2c72fd4
2014-07-30 12:33:33 +00:00
Torne (Richard Coles)
8c146ae9be
Merge "Parse system properties that are lists correctly." into lmp-dev
2014-07-24 15:36:04 +00:00
Christoph Studer
22f2ee567d
SysUI: Reset background treatment when re-using Entries
...
Bug: 16220667
Change-Id: I8fd2770fa5ea554728eb8cd70ce4a6171e28ece5
2014-07-30 11:40:24 +00:00
Torne (Richard Coles)
ff701a6a65
Parse system properties that are lists correctly.
...
String.split() returns a one-element array of the empty string if the
input is the empty string, not a zero-element array. Introduce a
getStringList function to handle this consistently in the cases where
system properties are parsed as comma separated lists.
The main result is that SUPPORTED_64_BIT_ABIS will now correctly be
empty on a 32-bit only device.
Change-Id: I6f74b48d0a6ced3cd6d49c05aad6a4b7e0b074d2
2014-07-30 12:14:40 +01:00
Sander Alewijnse
6c9eee8747
Add warning in the disambig for specific launchers.
...
For launcher that do not support managed profiles.
Also, ignore the intent after click on those launchers.
Change-Id: I3d5691952a9409755b7cde68a3caba98a3772665
2014-07-30 10:27:44 +00:00
Guang Zhu
fa4b5466bb
Merge "disable flashlight for monkey tests" into lmp-dev
2014-07-28 22:45:16 +00:00
Guang Zhu
2649f6b22a
disable flashlight for monkey tests
...
Change-Id: I81f459d41a780712f4c02e7ac7c0b51312e404be
2014-07-30 00:52:58 -07:00
Jae Seo
6e62a1508c
TIF: Use more consistent constant names
...
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
2014-07-30 11:46:41 +09:00
Alan Viverette
9e244b93c4
Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev
2014-07-28 22:45:16 +00:00
Alan Viverette
9b38f6c2cd
Revert "Update switch assets, fix SearchView asset 9-patch areas"
...
Missing updated current.txt
This reverts commit dbf6b0d68a3d502430d061cd14f03f344b50f019.
Change-Id: I70846883f56be661fa89f9eaf20f5d103f2833c6
2014-07-30 02:39:07 +00:00
Wonsik Kim
d922a546b9
TIF: ensure hardware / CEC event calling sequence
...
Bug: 16441047
Change-Id: Ie654b78ec91a081a1438cc036967f528e063f25b
2014-07-30 11:19:56 +09:00
Alan Viverette
8bb399069d
Update switch assets, fix SearchView asset 9-patch areas
...
BUG: 16606037
BUG: 16467249
Change-Id: Iabdf1634f4d8f87031ab3e5579140cdd428173de
2014-07-30 00:28:08 +00:00
Sandeep Siddhartha
8ef360f348
Notify VIS of shutdown before switching implementations
...
This lets the implementation cleanup before it's destroyed.
Bug: 16629417
Change-Id: Ia717d461677e9ca8fa66f02c030aacad1597692d
2014-07-29 17:23:40 -07:00
Tyler Gunn
5d231e1343
Adding video width/height to camera capabilities.
...
Bug: 16602621
Bug: 16573836
Change-Id: Idaca4b6d889bf7910fcc37bee7ef478e2fbe3af3
2014-07-30 00:07:46 +00:00
Jeff Sharkey
8a850b4c0e
Latest DocumentsUI material asset drop.
...
Bug: 15836082
Change-Id: Ifdd8a42a963071f1c958d56b3f835228f257cf9a
2014-07-29 23:53:37 +00:00
Alan Viverette
48b3fe6f12
Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
2014-07-29 21:36:00 +00:00
Dirk Dougherty
12b9f6ae37
am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.
...
* commit '78ad92b48f8e41a413b6a61970e278024098dbaa':
Doc change: add notice for admob sdk upgrade.
2014-07-30 00:55:51 +00:00
Dirk Dougherty
78ad92b48f
am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.
...
* commit '4ff57a9aee76bdfe6808ac9c64f2e90bc14a25ae':
Doc change: add notice for admob sdk upgrade.
2014-07-29 21:07:53 +00:00
Dirk Dougherty
4ff57a9aee
am fa3d1b2a: Doc change: add notice for admob sdk upgrade.
...
* commit 'fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
Doc change: add notice for admob sdk upgrade.
2014-07-29 21:03:25 +00:00
Dirk Dougherty
fa3d1b2a27
Doc change: add notice for admob sdk upgrade.
...
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
2014-07-29 20:32:17 +00:00
Robert Ly
9c53194a6f
am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs
...
* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
docs: fix typo bug 16623189
2014-07-29 16:34:01 +00:00
Robert Ly
58967bfbe8
am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs
...
* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
docs: fix typo bug 16623189
2014-07-29 16:30:07 +00:00
Robert Ly
0029ef6759
am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs
...
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
docs: fix typo
2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b
am 9613b433: Merge "docs: fix typo" into klp-modular-docs
...
* commit '9613b433f47162d008f034afbb16deac16532662':
docs: fix typo
2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149
am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
...
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
docs: Describe the alloc tracker in Android Studio
2014-07-29 15:32:57 +00:00
Ricardo Cervera
8d1aa95729
am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
...
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
docs: Describe the alloc tracker in Android Studio
2014-07-29 15:29:00 +00:00
Ricardo Cervera
5ff390be1b
am df881ccc: am 321e0302: docs: Fix Wear docs issues.
...
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
docs: Fix Wear docs issues.
2014-07-29 15:07:56 +00:00
Ricardo Cervera
df881ccc1f
am 321e0302: docs: Fix Wear docs issues.
...
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
docs: Fix Wear docs issues.
2014-07-29 15:01:11 +00:00
Filip Gruszczynski
896a82d77e
am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
...
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
Fix double chin issue, where bottom inset is applied twice.
2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729
am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
...
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
Remove PendingActivityLaunches based on stack.
2014-07-28 23:28:59 +00:00
Aravind Akella
6fc1901b1a
Merge "SensorManager API changes." into lmp-dev
2014-07-28 22:45:16 +00:00
Aravind Akella
0288ca63e3
SensorManager API changes.
...
i) Remove WAKE_UP_* sensor constants and corresponding string constants.
ii) Add getDefaultSensor(int, boolean) API.
Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
2014-07-29 17:41:02 -07:00
Alan Viverette
f709a5ba8c
Merge "Enable hardware rendering for system process" into lmp-dev
2014-07-29 21:36:00 +00:00
Jeff Sharkey
a847d79310
Light icons for DocumentsUI.
...
In some cases we want to show light variants. Also tweak drawer
sizes and grid padding.
Bug: 15836082
Change-Id: Ic6459ff0533a7d346c03db5d7deb3d6da42e7649
2014-07-30 00:35:57 +00:00
Alan Viverette
5e1565ead6
Enable hardware rendering for system process
...
Also enables hardware rendering by default on windows created
without a parent activity (e.g. by services).
BUG: 16240470
Change-Id: I906d48cb07af50fa02dae4f4ecdb5e65211fc6ef
2014-07-29 23:56:52 +00:00
Robert Ly
1c977b3744
Merge "docs: fix typo bug 16623189" into klp-modular-docs
2014-07-28 22:45:16 +00:00
Robert Ly
a66de16cde
docs: fix typo bug 16623189
...
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
2014-07-29 16:26:36 +00:00
Robert Ly
a37ddd97a8
docs: fix typo
...
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
2014-07-29 08:33:17 -07:00
Craig Mautner
0fa45d93f7
Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
2014-07-28 22:45:16 +00:00
Robert Shih
05ad96e9a3
Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev
2014-07-28 22:45:16 +00:00
Robert Shih
c42a96dba4
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
...
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
2014-07-29 11:55:46 -07:00
Craig Mautner
7f13ed37fd
Remove PendingActivityLaunches based on stack.
...
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.
Fixes bug 16045752.
Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
2014-07-28 14:00:35 -07:00
Alan Lau
52baf3d096
am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
...
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
2014-07-28 20:07:23 +00:00
Alan Lau
d2e1ecb67b
am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
...
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e
am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"
...
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
Revert "DO NOT MERGE Fix extraneous allocation and copying"
2014-07-28 19:57:55 +00:00
Alan Lau
77d6f36bbc
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
...
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.
Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60
am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying
...
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
DO NOT MERGE Fix extraneous allocation and copying
2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39
Revert "DO NOT MERGE Fix extraneous allocation and copying"
...
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.
Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
2014-07-28 19:51:01 +00:00
Alan Lau
3150372342
am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
...
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
DO NOT MERGE Implement line breaking using ICU break iterator
2014-07-28 19:10:29 +00:00