Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
229,501 Commits 3 Branches 0 Tags
613e5a0ee65bf45a7abdbe2b323e091579013bf5
Commit Graph

229501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
613e5a0ee6 Merge "CreateLightingFilter is now on SkColorMatrixFilter" 2016-01-13 15:34:57 +00:00
Alan Viverette
8a77da8626 Merge "Apply tick mark tint during view construction" 2016-01-13 15:16:11 +00:00
Alan Viverette
d154a5bb8d Apply tick mark tint during view construction 
...otherwise it never gets applied.

Change-Id: I06991b3cedcf3dcfb8e98ae61e3d679c35b68839
 2016-01-13 10:10:22 -05:00
Mike Reed
8ee246b4c7 CreateLightingFilter is now on SkColorMatrixFilter 
Change-Id: Ic53071aa5dc618ce1a72c531180d18304c7e522a
 2016-01-13 14:35:45 +00:00
Alan Treadway
fd53d56e38 Merge "Add extra to control USER_SETUP_COMPLETE behavior." 2016-01-13 14:07:38 +00:00
Clara Bayarri
25a2c21360 Merge "Fix missing MANAGE_USER error on calls to isDeviceSecure" 2016-01-13 14:04:20 +00:00
Geoff Mendal
57072d09c8 Merge "Import translations. DO NOT MERGE" 2016-01-13 13:58:38 +00:00
Geoff Mendal
5378a5bf3a Merge "Import translations. DO NOT MERGE" 2016-01-13 13:58:06 +00:00
Geoff Mendal
4da11f31c3 Import translations. DO NOT MERGE 
Change-Id: If349d6b1bd99c61e78a7076d4c7b506abb7c9ac0
Auto-generated-cl: translation import
 2016-01-13 05:55:54 -08:00
Geoff Mendal
be84a1b1e6 Import translations. DO NOT MERGE 
Change-Id: I81cf6e3ce955937cc57289a59ffb794e75f72d20
Auto-generated-cl: translation import
 2016-01-13 05:52:37 -08:00
Geoff Mendal
0cfb11063d Merge "Import translations. DO NOT MERGE" 2016-01-13 13:43:16 +00:00
Geoff Mendal
3e3a451f79 Import translations. DO NOT MERGE 
Change-Id: I488d48ed5a95fb2764dd2129fc512fa1c2db5fdb
Auto-generated-cl: translation import
 2016-01-13 05:37:19 -08:00
Clara Bayarri
8d35de8445 Fix missing MANAGE_USER error on calls to isDeviceSecure 
A poorly placed clear identity was causing some crashes as
apps were required to have the MANAGE_USERS permission to
query if the current user is secured.

Change-Id: I1120b1e4405e78389fcbcb3e7d1dba8c80500da3
 2016-01-13 13:21:03 +00:00
Geoff Mendal
899a711591 Merge "Import translations. DO NOT MERGE" 2016-01-13 13:15:14 +00:00
Adrian Roos
acc11c0701 Improve bouncer restart prompt message 
Bug: 26325366
Change-Id: I21ce92b763417f8f9cef571ceab840db71224bb7
 2016-01-13 13:06:39 +00:00
Geoff Mendal
e1161b06d1 Import translations. DO NOT MERGE 
Change-Id: I7e6b5a16f8f7c7835fb85abf4453ef979b2cfb2e
Auto-generated-cl: translation import
 2016-01-13 05:06:28 -08:00
Alan Treadway
94de8c890c Add extra to control USER_SETUP_COMPLETE behavior. 
For split-user cases it has been identified that provisioning
a profile-owner during user setup-wizard shouldn't cause
the setup-wizard to exit early generally. Adding this extra
allows a DPC to control whether the user can take further steps
in the setup-wizard after management provisioning completes.

Adding as a hidden extra since we don't expect this to be useful
until after N release.

Bug: 25858670
Change-Id: I599a5df4aef659769a6323402efe078d0d12d2ed
 2016-01-13 12:49:23 +00:00
Clara Bayarri
a1771110d6 Create Work Challenge per-user condition 
Change the current static condition to a per-user condition so we
can check and enable/disable the work challenge properly. Also add
an isAllowed API, as the Work Challenge can only be used when the
user's DPC targets N or above to maintain backwards compatibility.

Change-Id: I0cb8b475838816801868ffb24726407aa257b4de
 2016-01-13 10:27:12 +00:00
Keisuke Kuroyanagi
2d12690d70 Merge "TextView: Offer suggestions in context menu." 2016-01-13 08:02:00 +00:00
Jaewan Kim
a1dcb87565 Merge "Revive volume up/down long press in TV" 2016-01-13 04:58:46 +00:00
Jaewan Kim
765487f929 Revive volume up/down long press in TV 
PhoneWindowManager.interceptKeyBeforeQueuing isn't good place
to handle long press because rejecting a down event will not
synthesize further key repeat.

Move the logic to PhoneWindowManager.interceptKeyBeforeDispatching
instead.

This is the regression caused by following CL
001c59c Route volume keys directly to the audio system on TVs

Bug: 26268032
Change-Id: Ic8f6dfaec473c0d45ffa42475763622dc700e635
 2016-01-13 13:55:46 +09:00
Chris Craik
860c7669fe Merge "Fix the build" 2016-01-13 02:27:29 +00:00
Chris Craik
48cb62018c Fix the build 
Change-Id: I11aaa6dabdc3998155ee7f1ee58083bb88f19aad
 2016-01-12 18:26:55 -08:00
Doris Liu
e5d6e7c8f9 Merge "Get animation update timing for AVD" into mnc-dr1.5-dev am: a73abeaf4b am: 7537aa7596 
am: 65abc0e3d3  -s ours

* commit '65abc0e3d37e2df3caa6c02624ee7e999e0c1f26':
  Get animation update timing for AVD
 2016-01-13 02:23:45 +00:00
Raph Levien
a8d58aefa7 Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp 
am: 07ee518281

* commit '07ee51828196e4af5fd7841c20acda96791f7f70':
 2016-01-13 02:10:15 +00:00
Raph Levien
e53e428a7e resolve merge conflicts of 957bdc56c5 to master. 
Change-Id: I4c8749f92a1fa39bf0d08e10155d9e68c87401c0
 2016-01-12 17:45:34 -08:00
Chris Craik
477e26cf93 Merge "Switch to new rendering pipeline" 2016-01-13 01:13:32 +00:00
Wale Ogunwale
96eb366db9 Merge "Fixed some activity visiblility issues in picture-in-picutre mode" 2016-01-13 00:59:34 +00:00
Raph Levien
c08d43c4d7 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev am: 36c5ab3542 am: 50c22adc25 
am: 243efe13a4

* commit '243efe13a44faf3617e2df409fa8f4bd30078a5d':
  Fix measurement to respect grapheme and span boundaries
 2016-01-13 00:54:58 +00:00
Jim Miller
1fcd0c2e65 Merge "Fix problem where keyguard shows spontaneously" 2016-01-13 00:49:46 +00:00
Takayuki Hoshi
42d8756798 Merge "Do not show volume expander when there is no touch feature" 2016-01-13 00:47:25 +00:00
Adam Lesinski
84c5c08e3b Merge "resolve merge conflicts of 551fc6823a to master." 2016-01-13 00:43:39 +00:00
Adam Lesinski
881f6f9266 resolve merge conflicts of 551fc6823a to master. 
Change-Id: I2778bf2a364c103fc0d351f2afc4fc73bede2f19
 2016-01-12 16:41:48 -08:00
Ronghua Wu
23f9efcee3 Merge "Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC."" 2016-01-13 00:40:38 +00:00
Amit Mahajan
88ca5398eb Added constructor with looper param for OnSubscriptionsChangedListener 
am: 831e401c05

* commit '831e401c055391745691a58d0c87c48b49139f50':
  Added constructor with looper param for OnSubscriptionsChangedListener
 2016-01-13 00:36:14 +00:00
Thierry Strudel
c1a1823cb8 Merge changes I96415ec6,I5d3aa7f9,I6294915e,I361928c0 
* changes:
  Report SwapPss in dumpsys meminfo when requested and available
  Report SwapPss in am_pss reports
  Add Swap and SwapPss to meminfo checkin dump.
  Report SwapPss usage if available as part of Pss
 2016-01-13 00:33:13 +00:00
Jean-Michel Trivi
de41d3cd5a Merge changes from topic 'recordingcallback' 
* changes:
  Audio recording notification API
  AudioManager event dispatcher: make more generic
 2016-01-13 00:20:56 +00:00
Kenny Root
b05fd8860f Merge "Track changes in libcore" 2016-01-13 00:14:24 +00:00
Amit Mahajan
831e401c05 Added constructor with looper param for OnSubscriptionsChangedListener 
This is needed for tests as subclasses may need to specify which
looper to use.

Bug: 25691379
Change-Id: Ia6eb2d34c439b420ef81622e3c8ff50a0290da22
 2016-01-12 16:14:22 -08:00
Chris Craik
3daf4d3272 Switch to new rendering pipeline 
bug:22480459

Change-Id: I3ca94c4b6c556ba6d133e2314ac0307e874651fa
 2016-01-12 16:11:06 -08:00
Jean-Michel Trivi
d3c71f075b Audio recording notification API 
AudioService can register a recording callback with AudioSystem.
Callbacks are handled in a new class, RecordingActivityMonitor.
This class notifies registered AudioManager instances
  of updates, only if this AudioManager has client callbacks.
Each AudioManager dispatches updates to its registered
  callbacks.

Bug 22876530

Change-Id: I95c6e5ec0631e53af53a490bcecca96089490089
 2016-01-12 16:10:42 -08:00
Pavel Zhamaitsiak
e151fc6eb9 Merge "resolve merge conflicts of 68514d5325 to master." 2016-01-13 00:09:05 +00:00
Pavel Zhamaitsiak
cef504f914 resolve merge conflicts of 68514d5325 to master. 
Change-Id: Ifbd3766e8a799a72e49adcdc6c5d509f2b8b53a6
 2016-01-13 00:08:41 +00:00
Pavel Zhamaitsiak
6bb73856ee Merge "resolve merge conflicts of 68514d5325 to master." 2016-01-12 23:44:08 +00:00
Chris Craik
27182321dc Merge "Fix shadow bounds calculation" 2016-01-12 23:44:02 +00:00
Pavel Zhamaitsiak
95a0c7c8e6 resolve merge conflicts of 68514d5325 to master. 
Change-Id: I989230fe4a307070f7d13b53b9eea9f23a4b5e34
 2016-01-12 15:43:11 -08:00
Chris Craik
420d655950 Fix shadow bounds calculation 
Change-Id: I78b6aa91d62c3c4838ffc80b380604c7863e8467
 2016-01-12 15:38:14 -08:00
Chris Craik
d0eb180923 Merge "Rename Reorderers to Builders" 2016-01-12 23:00:50 +00:00
Chris Craik
f158b49c88 Rename Reorderers to Builders 
Change-Id: I9bb5a2e70055e2f6d14912fbd86ab72ac0d6e20c
 2016-01-12 14:45:08 -08:00
Kenny Root
59fdfb121f Track changes in libcore 
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.

Change-Id: I04438fda92cbcde8bc9c66be4f0440066926b51a
 2016-01-12 14:20:52 -08:00