Commit Graph

52264 Commits

Author SHA1 Message Date
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
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
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
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
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
f4b998153d Merge "Camera2: update legacy metadata" into mnc-dev 2015-05-28 17:48:17 +00: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
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
Andrei Stingaceanu
373816ef1f Stop showing both the floating toolbar and suggestions
The selection mode without selection (PASTE|SELECT_ALL)
pops up along the suggestion popup if we tap on a word
within 15sec of the most recent cut/copy/textChanged
operation. Fix this by making suggestion popup take
precedence.

Also moved the invalidation of the text changed time
into the handleTextChanged() which fixes the selection
mode starting once after the text has changed.

NOTE: Subsequent clicks on non-suggestion spans will
still trigger the selection mode without selection if
within the defined timeframe.

Bug: 20443325
Change-Id: If2726e2c965e77e82ef7b847cf352d4426205bdc
2015-05-28 11:26:28 +01:00
Doris Liu
36e3997451 Merge "Set a HW layer for Fragment alpha animation" into mnc-dev 2015-05-28 01:05:06 +00:00
Zach Johnson
841e7eb929 Merge "Update intents for CarrierService" into mnc-dev 2015-05-28 00:02:35 +00:00
Fyodor Kupolov
12e5fec238 Merge "Fixed indentation in setProfileName method" into mnc-dev 2015-05-27 23:56:06 +00:00
Zach Johnson
5c04bd767b Update intents for CarrierService
Keep the bind intent and the config intent separate.

Change-Id: I645a7e697d49d46a4870b7b3a252b3214ee85412
2015-05-27 16:53:09 -07:00
Fyodor Kupolov
78f1314a69 Fixed indentation in setProfileName method
Change-Id: I819bfd509b184b7952d8f9c466c9418353f890cb
2015-05-27 16:52:45 -07:00
Nancy Chen
f279341a91 Merge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev 2015-05-27 23:52:00 +00:00
Nancy Chen
a042e6c74e Update docstrings for VoicemailContract to be more descriptive.
Bug: 21343781
Change-Id: I221f61d4e9306a92c736a12b2cff3d9fccebdc47
2015-05-27 15:54:55 -07:00
Zach Johnson
42ecc9eb90 Drop the "Config". Just "CarrierService". It's cleaner.
b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
2015-05-27 15:30:31 -07:00
Alan Viverette
60bf94e3be Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev 2015-05-27 21:30:07 +00:00
Alan Viverette
d70b9e7aea Move ApplicationInfo hardware acceleration to public flags
Bug: 21342038
Change-Id: I5af826f3f2921eef24725c909304243c67f3da78
2015-05-27 14:29:20 -07:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Alan Viverette
d0699fa569 Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 2015-05-27 18:00:18 +00:00
Cedric Ho
2b919d4f69 Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 2015-05-27 17:46:41 +00:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
2015-05-27 10:28:05 -07:00
Cedric Ho
8fedcdad36 Add getCallingUid() to RecognitionService.Callback.
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
2015-05-27 09:51:19 -07:00
Andres Morales
2397427cb1 [LockSettings] migrate password attempt throttling to hardware
leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57
2015-05-26 19:48:51 -07:00
Alan Viverette
9123e666bb Merge "Update cached child enabled state before selector state" into mnc-dev 2015-05-26 22:27:31 +00:00
Alan Viverette
2232adddc5 Offset accessibility focus rect for view root's scrollY
Previously we were only partially transforming the focus rect into
window coordinates, so it was offset when the window was panned (for
example, when the IME was showing).

Bug: 20113389
Change-Id: I41f5ed20cb1404232b7042d37ca2fc725f9ee476
2015-05-26 15:24:18 -07:00
Paul Lawrence
3452d2d0db Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-26 21:52:58 +00:00
Abodunrinwa Toki
4d2fc599cf Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 2015-05-26 21:31:36 +00:00
Nicolas Prevot
5e0ef0d0e6 Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 2015-05-26 20:39:28 +00:00
Abodunrinwa Toki
6a0b277c7c Hide the floatingtoolbar when content rect is invisible.
Hide the floating toolbar when the content rect is outside the
source view's visible area.

Bug: 21304845
Change-Id: I0dd10ad2cda7a8d9b05c81334cdfbd68c22dbc6a
2015-05-26 21:35:18 +01:00
John Spurlock
12e0b390ef Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 2015-05-26 19:41:53 +00:00
John Spurlock
1b8b22b1a4 Zen: Calendar auto-rule tracks primary calendar for corp profile.
- Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c
2015-05-26 15:39:05 -04:00
Yin-Chia Yeh
854b523e11 Camera2: update legacy metadata
Bug: 21438559
Change-Id: Ic3c32b7706d2d8c7efae36e80e4e242111796520
2015-05-26 11:52:55 -07:00
Yohei Yukawa
41bb4953da Rely on IMM#focusOut() to close input session.
Historically we have been doing nothing in IMM#focusOut().
Problem of ignoring IMM#focusOut() may not be obvious as
long as IMM#focusIn() is called immediately after
IMM#focusOut().  In some particular situations, however,
IMM can fall into an inconsistent state where the software
keyboard continues to be shown even when there is no text
input field.

As reported in b.android.com/171190 or Bug 20820914, we
can easily reproduce that inconsistent state by removing
a focused EditText from the parent view while the IME still
keeps an active connection to the EditText.

This CL tries to address such a situation by staring using
IMM#focusOut() as another trigger to check IME focus.

Note that this CL has no effect if IMM#focusOut was called
after the current window losed the focus. It is supposed to
be taken care of in subsequent CLs for Bug 20612313.

This CL depends on Id6afc8fc64512225578c62557b96c7dc2e969adf.

Bug: 20612313
Change-Id: Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930
2015-05-26 11:42:43 -07:00
Abodunrinwa Toki
da1b398173 Merge "Support icons in the FloatingToolbar" into mnc-dev 2015-05-26 18:26:37 +00:00
Paul Jensen
46ed04de08 Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev 2015-05-26 17:37:33 +00:00