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

52293 Commits

Author SHA1 Message Date
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
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
d3e6c7bb46 am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 
* commit '5ccfe51d8b9ae4f73a3b0fdb553b807cf5691582':
  [LockSettings] migrate password attempt throttling to hardware
 2015-05-27 20:24:08 +00:00
Alan Viverette
91dc8ec89e am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 
* commit 'd0699fa5697ba43c64c142ee67b245e0a346acfe':
  Avoid strict mode violation during saveAttributeData
 2015-05-27 20:23:52 +00:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Cedric Ho
b7dbfc61f6 am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 
* commit '2b919d4f69807528a11e38aee1a87507249d8319':
  Add getCallingUid() to RecognitionService.Callback.
 2015-05-27 18:01:44 +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
3471d15c88 am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 
* commit '165229ba417fd77ccbb4feb3bc3c664d2cac7ce5':
  Add workaround for measuring stacked button bar layout
 2015-05-27 17:43:08 +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
6f56420b7e am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev 
* commit '9123e666bb1a54b466c678400c344c1bb3a266f9':
  Update cached child enabled state before selector state
 2015-05-26 22:35:29 +00:00
Alan Viverette
b4f14de830 am 2232addd: Offset accessibility focus rect for view root\'s scrollY 
* commit '2232adddc56bb8764a95bbde0c05e0f02f6a1db5':
  Offset accessibility focus rect for view root's scrollY
 2015-05-26 22:35:25 +00: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
cda660f125 am 3452d2d0: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '3452d2d0dbffc74a87751b39da9fa40d88d5c91f':
  Honor password visible setting in CryptKeeper
 2015-05-26 22:06:57 +00:00
Paul Lawrence
3452d2d0db Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-26 21:52:58 +00:00
Abodunrinwa Toki
6c3a508f6a am 4d2fc599: Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 
* commit '4d2fc599cf5e7ac0735af683d215ce3dbf91b9fe':
  Hide the floatingtoolbar when content rect is invisible.
 2015-05-26 21:46:53 +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
7b8e8691d4 am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 
* commit '5e0ef0d0e62b77bcfc687bfbc1db875db71eba69':
  Say in the doc that DISALLOW_CONFIG_VPN now works.
 2015-05-26 20:51:43 +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
82a0c9b363 am 12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 
* commit '12e0b390efd2fb8c21a2700be9dcd95d15b31ba6':
  Zen: Calendar auto-rule tracks primary calendar for corp profile.
 2015-05-26 19:49:50 +00: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