Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
390,043 Commits 3 Branches 0 Tags
12edaafefc5aee1f87fc5aba4168d87cb64458e5
Commit Graph

390043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
12edaafefc Merge "[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 46049f5fec -s ours am: fb5b05d2ff -s ours am: b7ce376383 -s ours" 2018-10-25 23:32:58 +00:00
Chih-Hung Hsieh
76efb2b691 [automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 46049f5fec -s ours am: fb5b05d2ff -s ours 
am: b7ce376383  -s ours

Change-Id: Ic6dda848431242e4238dd97cd42512d2a18d3741
 2018-10-25 16:32:24 -07:00
Android Build Merger (Role)
a4348888f8 Merge "Merge "Allow implicit-fallthrough warnings locally." am: dd68cf76de am: 0db2c27df7 am: eb919bc560" 2018-10-25 23:32:19 +00:00
Chih-hung Hsieh
24df0f9051 Merge "Allow implicit-fallthrough warnings locally." am: dd68cf76de am: 0db2c27df7 
am: eb919bc560

Change-Id: If05d93a4eea5b0330585bd7e3b64a68d2006e84c
 2018-10-25 16:31:55 -07:00
Android Build Merger (Role)
618538adcf Merge "Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83 am: a6c90c99cd am: bd0093e182" 2018-10-25 23:25:58 +00:00
Chih-Hung Hsieh
78cb9b14cf Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83 am: a6c90c99cd 
am: bd0093e182

Change-Id: Idfda76fbd502f84ac7abb9315d6fff9e923fdefd
 2018-10-25 16:25:20 -07:00
Matthew Ng
a3501ed0e4 Merge "Experiment to be able to change the navigation bar thickness (1/2)" 2018-10-25 23:17:46 +00:00
Dan Shi
420c35784b Merge "resolve merge conflicts of 3084f41930 to master" 2018-10-25 23:08:50 +00:00
Jovana Knezevic
840d565542 Merge "Adds automatic switching to Guest if user starts driving with the keyguard up." 2018-10-25 22:52:28 +00:00
TreeHugger Robot
bef47d02d5 Merge "DataSourceDesc: set max time in ms and us" 2018-10-25 22:11:19 +00:00
TreeHugger Robot
93399bedce Merge "Null check on NavigationBarView in NavigationBarFragment" 2018-10-25 21:43:54 +00:00
TreeHugger Robot
148eba158c Merge "Use raw MotionEvent coordinates when tracking velocity" 2018-10-25 20:52:36 +00:00
Dan Shi
059d6d7016 resolve merge conflicts of 3084f41930 to master 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie8de98c824fc07b35c50585359a6b9c32eea18e5
 2018-10-25 13:13:57 -07:00
Jeff Sharkey
ac1973164c Merge "We wanted actual protection level, not flags." 2018-10-25 20:12:20 +00:00
Lucas Dupin
e5a33306a5 Merge "Animate backspace when unlocking" 2018-10-25 19:59:07 +00:00
TreeHugger Robot
f7082520bf Merge "Factor out InputMethodManager#forContext()" 2018-10-25 19:39:41 +00:00
Marco Nelissen
6baf5e4e1c Merge "Don't try to compress opus resources" 2018-10-25 19:39:11 +00:00
TreeHugger Robot
f456997a8a Merge "Make pattern animation a little faster" 2018-10-25 19:35:22 +00:00
TreeHugger Robot
03b8c0f49c Merge "Allow atoms to log fields in bytes format." 2018-10-25 19:04:17 +00:00
Wei Jia
f4d209cd36 DataSourceDesc: set max time in ms and us 
Test: cts
Bug: 112549021
Change-Id: I1ff062a26be896c62500457da18ce3b5a869765a
 2018-10-25 11:41:09 -07:00
Bill Yi
e8b53b2d54 Merge "Merge pi-dr1-dev to aosp-master" am: 04d53e2611 am: 6bf05d4c6f 
am: f5e484a688

Change-Id: I31d6d55abca96f2db908bb1a93b6824cbc83f11b
 2018-10-25 11:25:08 -07:00
Matthew Ng
605ea47490 Experiment to be able to change the navigation bar thickness (1/2) 
Use resource overlays to change the 2 dimension navigation_bar_height
and navigation_bar_frame_height to specify how large the navigation bar
is and how large its buttons are (also for width). There are two
overlays: first to slim the navigation bar to 75% and the other to have
floating navigation buttons.

go/navbar-experiments-doc

Test: manual
Bug: 113952590
Change-Id: I936c9fa49ba029b4174a22b7e35ee070a9e07e4b
 2018-10-25 11:18:02 -07:00
Evan Laird
b8b717f795 Null check on NavigationBarView in NavigationBarFragment 
While sysui is starting, it's possible to get disable callbacks before
the NavigationBarView has had a chance to get created. In this case just
don't pass the message, similar to Disable1 callbacks

Change-Id: Ic89ca281579ff9720c356f79102d1b576670740a
Fixes: 118357487
Test: no exceptions during system boot after wiping
 2018-10-25 14:08:32 -04:00
Alison Cichowlas
1943b6f856 Merge "Suppress flaky test" 2018-10-25 17:59:41 +00:00
Makoto Onuki
25c782f9f2 Merge "DB Wipe detection" 2018-10-25 17:40:43 +00:00
Jeff Sharkey
da3b55a122 Merge "Reroute Uri conversions though MediaProvider." 2018-10-25 16:57:59 +00:00
Jean-Michel Trivi
4ea7d34d13 Merge "AudioTrack: fix javadoc" 2018-10-25 16:37:17 +00:00
Lucas Dupin
33b4c28c32 Animate backspace when unlocking 
Bug: 111405682
Fixes: 118414397
Test: visual
Change-Id: Ie5af400e9869558832939debdb61190d6d32f3d7
 2018-10-25 16:37:04 +00:00
John Reck
fcf14cfd94 Merge "Add theme & View API to control force-dark" 2018-10-25 16:35:10 +00:00
Jean-Michel Trivi
8d32c45729 AudioTrack: fix javadoc 
Bug: N/A
Test: make offline-sdk-docs
Change-Id: Ie2ebeddc477d5bd083280cfb91bd8c82e7047fb4
 2018-10-25 09:30:37 -07:00
Jeff Sharkey
9d4654c03a We wanted actual protection level, not flags. 
Bug: 118083154
Test: manual
Change-Id: Ib5b105add2b92401f2dc4a3ca676d3303b46d54f
 2018-10-25 09:58:59 -06:00
Marco Nelissen
18f16d6241 Don't try to compress opus resources 
Test: build

Change-Id: Ibf398b3afca02d4111d88b126c8d107ac44068a6
 2018-10-25 08:31:19 -07:00
Alison Cichowlas
29c64fb096 Suppress flaky test 
Test: This is it
Bug: 118400112
Change-Id: I60be79618f4fd5b22438d47f1b8ce0756d486dee
 2018-10-25 11:27:15 -04:00
TreeHugger Robot
1d63e024de Merge changes Ic6b623a7,Ib6811066 
* changes:
  Makes minor modifications to Intent-based Service APIs
  Adds AIDL definitions for register/unregisterIntent
 2018-10-25 15:14:17 +00:00
Makoto Onuki
8d71ec09b7 Merge "Sync log on IO thread" 2018-10-25 15:03:23 +00:00
Makoto Onuki
1f9bbc0d6b Sync log on IO thread 
Change-Id: Ifa1a0afd2faca9e992841d7fd7f79d7d1b615559
Fixes: 118428335
Test: Manual test with toggling sync and checking "dumpsys content -a"
 2018-10-25 14:25:44 +00:00
Jean-Michel Trivi
08f096855e Merge "Offload support for android.media.AudioTrack" 2018-10-25 14:21:40 +00:00
TreeHugger Robot
bd70ed4cfa Merge "Implement TextClassifierImpl.detectLanguage()" 2018-10-25 13:19:24 +00:00
TreeHugger Robot
e367c38d5c Merge "Import translations. DO NOT MERGE" 2018-10-25 11:47:39 +00:00
Misha Wagner
cc065fb95e Modify Process::readProcFile to read in variable size file 
The original Process::readProcFile could only read files smaller than 256 bytes.
This change allows the function to read in larger files. For files smaller than
256 bytes, the added cost is only an extra read call, which returns zero.

Documentation has also been added to Process::readProcFile.

Test: Used in change 5168194

Change-Id: I82f27355276e08f96bdb5fe7da49514a87afb429
 2018-10-25 10:51:40 +01:00
Bill Yi
18b40388c8 Import translations. DO NOT MERGE 
Change-Id: Ia30ea38f3c4c9661be000a56baf65ce8f6c708ef
Auto-generated-cl: translation import
 2018-10-25 01:05:03 -07:00
Louis Chang
1332beacbe Merge "Add tests for VR preferred display id calculation" 2018-10-25 07:08:28 +00:00
Siarhei Vishniakou
c8548557ce Use raw MotionEvent coordinates when tracking velocity 
Unfortunately, we have to roll back the commit "use raw coordinates in
velocitytracker" ag/3545962 because it broke some assumptions in the
view hierarchy. That is being done in aosp/800996.

As a result, we have to start working around the revert by manually
adjusting the coordinates. This is effectively a revert of ag/4071758
that has been rebased on ag/4891556.

Test: manual interaction with notification panel (pulling down,
flinging at various points)
Bug: 117921784
Bug: 117475766

Change-Id: I24c5815967381cd4be983ef7e8456fa7d42c53c8
 2018-10-24 23:14:55 -07:00
Wei Wang
86d0d9d8e5 Merge "BootAnimation: Use system log" 2018-10-25 03:56:48 +00:00
TreeHugger Robot
986ba8aa20 Merge "Fix test failure in ActivityManagerInternalTest" 2018-10-25 03:46:40 +00:00
TreeHugger Robot
c242dac241 Merge "[Screenshot] Accept data space and pixel format for screenshot." 2018-10-25 03:29:31 +00:00
TreeHugger Robot
d871966420 Merge "Fix AlarmManagerServiceTest and add some more tests" 2018-10-25 03:23:22 +00:00
TreeHugger Robot
fd5117d680 Merge "make testdrive log message less verbose" 2018-10-25 02:16:35 +00:00
Xiangyu/Malcolm Chen
a2429cb371 Merge "Changing setPreferredData so that it takes subId." 2018-10-25 01:38:51 +00:00
Jeff Sharkey
643e99ef06 Reroute Uri conversions though MediaProvider. 
Upcoming changes will prevent apps from reading "_data" columns
directly, which is required to convert between DocumentsProvider and
MediaProvider Uris.  To solve this, delegate the call() through
MediaProvider, where it can perform the "_data" lookup on behalf
of the caller.

Also add new getMediaUri() call to offer symmetry.

Bug: 111960973, 117627072, 110961701
Test: atest android.provider.cts.MediaStoreUiTest
Change-Id: I53c640704d86047d7a4bf1702aca027873395abf
 2018-10-24 19:34:09 -06:00