Commit Graph

52579 Commits

Author SHA1 Message Date
Yohei Yukawa
1d95daf37d am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '4ad0161a45a872981199285a0c72d2e79de44ba5':
  Revert "Rely on IMM#focusOut() to close input session."
2015-06-01 15:28:01 +00:00
Doris Liu
0040c7d2ba am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit 'c271314154efc468022b9464a8d18eadf07a7183':
  Update doc to include how clipToPadding affects EdgeEffect
2015-06-01 15:27:54 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
2015-06-01 15:26:00 +00:00
John Spurlock
f7043e284a am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '015a95ff35e5e9de959c10d082fbe2e10c58885c':
  Zen: Use account name instead of calendar id in event conditions.
2015-06-01 15:24:42 +00:00
Raph Levien
1091defa85 am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '023973ecc66c62f2b83d9154097bb370966ed96d':
  Use getRunAdvance to position cursor
2015-06-01 15:23:16 +00:00
Yohei Yukawa
47d691baf7 am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '92086e06ad3167ebfadbc746d32e86c335878a8f':
  Rely on IMM#focusOut() to close input session.
2015-06-01 15:22:58 +00:00
Andres Morales
0b8ddb4792 am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery
2015-06-01 15:22:42 +00:00
Neil Fuller
1d66281e4b am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '59b240404f19f3450e710e07a90d4e8d35fabcaf':
  Fix javadocs based on recent case consistency change
2015-06-01 12:26:01 +00:00
Neil Fuller
e761938c39 Merge "Fix javadocs based on recent case consistency change" 2015-06-01 12:01:44 +00:00
Chad Brubaker
533d164ed0 am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"
* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish
2015-05-29 21:44:34 +00:00
Yohei Yukawa
650a91356b Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev 2015-05-29 20:41:25 +00:00
Doris Liu
f042cd841f Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev 2015-05-29 20:28:21 +00:00
Yohei Yukawa
0b52ed02df Revert "Rely on IMM#focusOut() to close input session."
This reverts commit 41bb4953da.

Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930 caused Bug 21508503.
Since it looks like a timing issue, many other applications
could be affected potentially.

Bug 21508503 implies that re-enabling IMM#focusOut() globally
requires much more work than we thought.  Probably the memory
leak found in Bug 20820914 should be addressed in a more
conservative way at the moment, e.g., by plumbing events from
ViewGroup to IMMS.

Bug: 21508503
Bug: 20820914
Change-Id: I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f
2015-05-29 13:28:13 -07:00
Chad Brubaker
9ce30624a4 Add optional additional entropy to finish
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
2015-05-29 12:32:56 -07:00
Doris Liu
b134b5e376 Update doc to include how clipToPadding affects EdgeEffect
Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a
2015-05-29 11:20:46 -07:00
James Cook
63b6320af4 Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 2015-05-29 17:30:23 +00:00
John Spurlock
6a2999073c Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 2015-05-29 13:22:33 +00:00
John Spurlock
995a749f27 Zen: Use account name instead of calendar id in event conditions.
- Migrate the existing calendar attribute in the event condition
   from a long calendar id to the calendar account name.  More
   portable across a backup/restore.
 - Also skip restoring transient state (like the current condition
   state) from restored automatic rules.

Bug: 17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2
2015-05-28 22:13:03 -04:00
Yohei Yukawa
c6fb8f827d am 98e88900: am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
* commit '98e8890022119bc9d053b55d2f05617b6d7bacb9':
  Clear the inset of previous IME when necessary.
2015-05-29 00:29:14 +00:00
Raph Levien
71a2876497 Merge "Use getRunAdvance to position cursor" into mnc-dev 2015-05-29 00:05:09 +00:00
Yohei Yukawa
5176b5451a Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 2015-05-28 23:52:50 +00:00
Andres Morales
a5705a4ada Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 2015-05-28 23:41:04 +00:00
Raph Levien
cb5499c850 Use getRunAdvance to position cursor
TextLine used to use getTextRunAdvances on a substring to compute a
cursor position, but this had a number of problems, especially when
the substring is a wider than the full string (as can happen in
certain Tamil ligatures).

This patch changes the implementation to use getRunAdvance, which was
explicitly designed for this use case.

We should also change Layout.getHorizontal to use the dual
getOffsetForAdvance, but that's basically a performance optimization,
the functionality should be basically equivalent.

Bug: 21125816
Change-Id: I669b85eaecfbf6f7aa6c6a9dddbf1a210eb94571
2015-05-28 16:36:36 -07:00
Yohei Yukawa
85b883cae4 Merge "Clear the inset of previous IME when necessary." into mnc-dev 2015-05-28 23:20:12 +00:00
Yohei Yukawa
2977eb7b6c Clear the inset of previous IME when necessary.
In the following scenario, the system continues keeping the previous
IME's inset in the display until the new IME shows its window.
1. an IME shows its software keyboard with reporting non-empty inset.
2. the user switches to another IME, which does not show the software
   keyboard when it is selected (e.g., because the physical keyboard
   is connected.)

This CL tries to address above situation by introducing a new state
flag IMMS#mShouldClearInsetOfPreviousIme to clear the previous IME's
inset when necessary.

Bug: 15922840
Change-Id: Ib04967f39b2529251e4835c42e9f99dba2cf43f2
2015-05-28 22:52:49 +00:00
James Cook
5cfaae4aae assist: Fix reported colors/styles for TextView/Switch
Changes to the data provided to AssistStructure:
* Text foreground color is correct even if the view has not yet been
painted.
* Text background color is now always 1 (TEXT_COLOR_UNDEFINED) for a
TextView, as it has no separate concept of background color.
* Switch now reports the text size/color/style of the label text
(usually user visible) rather than the on/off text on the button
itself (usually hidden in Material, and not usually revelant when
visible).

Bug: 21080375
Change-Id: I7e15f68d89510a76cab76031c2c8ca6ca3f32435
2015-05-28 15:52:44 -07:00
Tao Bao
69dd849ed3 am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
* commit '5f90a8c5bd689afa8403d7dce967bf96a82880c4':
  Wait for uncrypt to finish before rebooting
2015-05-28 22:35:45 +00:00
Dianne Hackborn
e6562d903b am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
* commit 'da71e1004082427e36db21c39f47b13e0afa8ed4':
  Add new API to set URI on AssistContent.
2015-05-28 22:35:39 +00:00
Doris Liu
937b7ad9f7 am 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev
* commit '7b554a8f1513c1737a9326b7e99b83fe5aab53f0':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag
2015-05-28 22:34:57 +00:00
Adam Lesinski
1d4db0e4a6 am e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
* commit 'e87126e8915785e1801580d44ea181304bbfa701':
  BatteryStats: Output per-app wifi controller distribution
2015-05-28 22:34:37 +00:00
Tao Bao
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +00:00
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Doris Liu
057d93971a Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev 2015-05-28 20:33:12 +00:00
Doris Liu
c81c082628 Fix ScrollView's EdgeEffect to respect clipToPadding flag
bug: 19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408
2015-05-28 13:29:44 -07:00
David Srbecky
9d698acfc4 am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."
* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
  Replace --include-cfi with --generate-debug-info.
2015-05-28 20:16:45 +00:00
Adam Lesinski
8a179cab79 Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 2015-05-28 20:04:18 +00:00
Adam Lesinski
049c88b48a BatteryStats: Output per-app wifi controller distribution
Currently we only output this data on checkin, adding the output
to dumpsys as well.

Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0
2015-05-28 12:51:19 -07:00
Peng Xu
0df9a7cfd8 am 2c530e41: am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev
* commit '2c530e41e0e5ed7b30693a8eff8f14029a27ea45':
  Bug fix and documentation clarification
2015-05-28 19:29:24 +00:00
Peng Xu
08ecf676e6 Merge "Bug fix and documentation clarification" into mnc-dev 2015-05-28 18:57:46 +00:00
Dianne Hackborn
09d57fe9b3 Add new API to set URI on AssistContent.
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.

Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
2015-05-28 11:44:58 -07:00
Yin-Chia Yeh
9d16a7d8bb am 9d3df9b7: am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev
* commit '9d3df9b7bacb7ba51d337893a7b5269d69d697d1':
  Camera2: update legacy metadata
2015-05-28 18:21:44 +00:00
Yin-Chia Yeh
f4b998153d Merge "Camera2: update legacy metadata" into mnc-dev 2015-05-28 17:48:17 +00:00
Svet Ganov
6e52047011 am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev
* commit '73e74be1dc0294336b5104d6169177955b53490f':
  Add a normal permission guarding the installer UI - used for stats tracking
2015-05-28 17:30:23 +00:00
Neil Fuller
0e1c0e11e4 Fix javadocs based on recent case consistency change
Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
Change-Id: If4c6b3a13f61bd0cb64c82fc4c96d053130ae4c8
2015-05-28 18:21:29 +01:00
David Srbecky
f39477b592 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-05-28 17:16:09 +01:00
Svet Ganov
63428ccde7 Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev 2015-05-28 15:37:06 +00:00
Svet Ganov
86877e44f0 Add a normal permission guarding the installer UI - used for stats tracking
bug:2147009

Change-Id: Id020eaf7b852de43966f4ab8231e3f7046e66542
2015-05-28 08:33:45 -07:00
John Spurlock
bfc6097208 am d036da08: am 008232ac: Merge "Zen: Store notification zen policy per-user." into mnc-dev
* commit 'd036da08125854ab7814166feb18203cbf87a72e':
  Zen: Store notification zen policy per-user.
2015-05-28 14:18:05 +00:00
John Spurlock
008232acbd Merge "Zen: Store notification zen policy per-user." into mnc-dev 2015-05-28 13:53:43 +00:00
John Spurlock
21258a3703 Zen: Store notification zen policy per-user.
- Keep a zen config per user in NoMan.
 - Add zen config for all users to xml policy storage mechanism.
 - Initialize config to default for new secondary users.
 - Re-evaluate global zen on user switch.
 - Remove some unused code in NoMan.
 - Make ZenModeHelper aware of multiple users, keep all configs,
   add to dump.
 - Log config diffs in addition to the config itself in ZenLog.

Bug: 15845915
Change-Id: Ic847451e5d111c74916def1ea0948db5a76966c9
2015-05-28 09:23:58 -04:00