Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,538 Commits 3 Branches 0 Tags
fbfe254e243bc67def597928c4b16c003b7006be
Commit Graph

52323 Commits

Author SHA1 Message Date
John Spurlock
fbfe254e24 am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
  Zen: Use account name instead of calendar id in event conditions.
 2015-05-29 13:31:48 +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
Raph Levien
4900619bc1 am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev 
* commit '71a2876497385cd61083cf3a7a86db068ae4b0b3':
  Use getRunAdvance to position cursor
 2015-05-29 00:25:52 +00:00
Yohei Yukawa
c96dceefd9 am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 
* commit '5176b5451a8447de3ff86712a95efd6af93aa556':
  Rely on IMM#focusOut() to close input session.
 2015-05-29 00:25:28 +00:00
Andres Morales
a93089711a am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 
* commit 'a5705a4ada8e719ebf73ed757c514b74785e7ae3':
  [partition checking] re-enable bootimage/bootloader, add recovery
 2015-05-29 00:25:09 +00:00
Yohei Yukawa
d9dacd4c5e am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev 
* commit '85b883cae410bd2b8e1dc5c34265ed253d758e86':
  Clear the inset of previous IME when necessary.
 2015-05-29 00:24:59 +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
Tao Bao
271559854b am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 
* commit '165102f350e08bd186b25b90dd8a42aad8975890':
  Wait for uncrypt to finish before rebooting
 2015-05-28 21:51:48 +00:00
Dianne Hackborn
1f8a1f57ff am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev 
* commit '4573dddcce3f232d2eeb20bfe0e204e15a9416e9':
  Add new API to set URI on AssistContent.
 2015-05-28 21:51:43 +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
95ed0fb935 am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev 
* commit '057d93971a5415a989ec5c8a8b0437ee12b6604f':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag
 2015-05-28 21:28:46 +00:00
Adam Lesinski
f0901c6c9d am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 
* commit '8a179cab7971782900f5b4a872f4f432c7d17987':
  BatteryStats: Output per-app wifi controller distribution
 2015-05-28 21:28:04 +00:00
Peng Xu
adda558810 am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev 
* commit '08ecf676e655ba7a86744f63045290d1e331c0f6':
  Bug fix and documentation clarification
 2015-05-28 21:27:25 +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
8720e86ef4 am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev 
* commit 'f4b998153d4d921a64b7cfdb523cd3a97e2849a9':
  Camera2: update legacy metadata
 2015-05-28 18:02:43 +00:00
Yin-Chia Yeh
f4b998153d Merge "Camera2: update legacy metadata" into mnc-dev 2015-05-28 17:48:17 +00:00
Svet Ganov
acbbc2bc1f am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev 
* commit '63428ccde7e925ceb94aa40e933b3d51954a7797':
  Add a normal permission guarding the installer UI - used for stats tracking
 2015-05-28 15:51:04 +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
320a702c99 am 008232ac: Merge "Zen: Store notification zen policy per-user." into mnc-dev 
* commit '008232acbdc9b6988f498b619b686efd02e614ae':
  Zen: Store notification zen policy per-user.
 2015-05-28 14:03:15 +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
Andrei Stingaceanu
211ad97aba am 373816ef: Stop showing both the floating toolbar and suggestions 
* commit '373816ef1f7ab9954889ed02a6b2b39fe4aa4f44':
  Stop showing both the floating toolbar and suggestions
 2015-05-28 10:59:13 +00: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
80ee2b50dc am 36e39974: Merge "Set a HW layer for Fragment alpha animation" into mnc-dev 
* commit '36e39974513a44f979e28a9b68f5f4ca366f60e1':
  Set a HW layer for Fragment alpha animation
 2015-05-28 01:15:32 +00: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
ed893215d4 am 841e7eb9: Merge "Update intents for CarrierService" into mnc-dev 
* commit '841e7eb929a71687e55044e1291b778f94fd90e2':
  Update intents for CarrierService
 2015-05-28 00:09:46 +00:00
Fyodor Kupolov
763ef36f5d am 12e5fec2: Merge "Fixed indentation in setProfileName method" into mnc-dev 
* commit '12e5fec238c6576c1fdec1a88d6696fc29426797':
  Fixed indentation in setProfileName method
 2015-05-28 00:09:41 +00:00
Nancy Chen
d5905268e7 am f279341a: Merge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev 
* commit 'f279341a9170c0158647a5b449d0f5d44e2e830d':
  Update docstrings for VoicemailContract to be more descriptive.
 2015-05-28 00:09:36 +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
Zach Johnson
34f8015ff2 am 68bca39a: Merge "Drop the "Config". Just "CarrierService". It\'s cleaner." into mnc-dev 
* commit '68bca39a6a85c40638b28b7c91f154045afe5b10':
  Drop the "Config". Just "CarrierService". It's cleaner.
 2015-05-27 23:17:28 +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
e014390c79 am 60bf94e3: Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev 
* commit '60bf94e3bef8da0adb4f42043770cef7a608d07d':
  Move ApplicationInfo hardware acceleration to public flags
 2015-05-27 21:34:54 +00:00