drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
184,214 Commits 1 Branch 0 Tags
Commit Graph

184214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
d5a622279d Merge "AudioService: Define minimum levels for volume streams." 2015-03-13 15:45:31 +00:00
John Spurlock
b6e19e3e0f AudioService: Define minimum levels for volume streams. 
- Set a floor of 1 for voice call + bluetooth sco, otherwise 0.
 - All api calls validated to ensure a floor of the min level.
 - Volume UI updated to shift the seekbar by the min value.
 - Remove duplicate static max method in AudioService.
 - Ensure streams with a min level > 0 are not considered muteable.

Bug: 19260237
Change-Id: I213180c9c277f51bd3897b7f777e5f88ed1db125
 2015-03-13 11:02:01 -04:00
Yohei Yukawa
2fbea7ff90 Merge "Expose isSystemImeThatHasSubtypeOf to Settings" 2015-03-13 13:46:40 +00:00
Yohei Yukawa
9c83ff471d Expose isSystemImeThatHasSubtypeOf to Settings 
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3

In the avobe CLs, an internal (hidden) method
InputMethodUtils.isValidSystemDefaultIme was marked as
deprecated and we decided to migrate to
InputMethodUtils.isSystemImeThatHasSubtypeOf.

To finish this refactoring, this CL make the new
method visible to the settings app.

InputMethodUtils.isValidSystemDefaultIme remains
to be an internal method. No behavior change is
intended.

Change-Id: I8cb9ca40d15af099c3d1ded46797fb57f14fb9e8
 2015-03-13 22:43:06 +09:00
Clara Bayarri
67e4392bf6 Merge "Support a Primary and a Floating ActionMode in DecorView." 2015-03-13 12:17:39 +00:00
Derek Sollenberger
ee248599d4 Refactor DisplayList path caching. 
This removes dependence on SkPath ptrs that HWUI does not control
the lifecycle of. This clears up some errors where the paths are
not generated from Java, but rather the Skia test suites.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: I41b9797a2b0af5d6b4ea51891565469d4f1d832d
 2015-03-13 08:05:55 -04:00
Leon Scroggins III
247dc6e125 Fix use of SkMutex. 
Recent change to Skia moved SkMutex into its own header file. Include
it to use and SkMutex.

Use SK_DECLARE_STATIC_MUTEX to remove static initializer/finalizer.

Fixes master-skia build.

Change-Id: I2ab43c511587167b81310d5d55a65604d82761f5
 2015-03-13 08:05:07 -04:00
Derek Sollenberger
130cf8ce1f Merge "SkStream is no longer a ref counted object." 2015-03-13 12:02:24 +00:00
Clara Bayarri
80c3856122 Support a Primary and a Floating ActionMode in DecorView. 
This CL modifies the support for a single ActionMode in PhoneWindow.
DecorView to support both a Primary and a Floating ActionModes
simultaneously.

Things pending after this CL:
- Handling an actual Floating ActionMode
- Cleaning up the now unused ActionModeWrapper and its related code

Change-Id: Ie2e5ec27393ce9eededadf5bc379bab39981a365
 2015-03-13 10:51:51 +00:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls. 
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
 2015-03-13 10:51:51 +00:00
Craig Mautner
993d128477 am e8ef4af3: am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit 'e8ef4af3dfdf35d1094c57c79c84527310480d41':
  Correct docs to specify leading slash in paths.
 2015-03-13 07:41:26 +00:00
Andreas Gampe
1b4e56ac36 resolved conflicts for merge of 1d67698b to master 
Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b
 2015-03-13 00:17:40 -07:00
Olawale Ogunwale
ce389e00cf am 2f952916: am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions" 
* commit '2f9529168974fb6ca3a70372fd802e845e015bfd':
  Wait for visible wallpaper drawn before starting app transitions
 2015-03-13 07:09:55 +00:00
Roozbeh Pournader
4d446913e9 am 8a264dd2: am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit '8a264dd289df13dfae7d5c89fc4b6f69b30230be':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-13 07:08:55 +00:00
Lorenzo Colitti
2cabb7ddb6 am 4a61eaf7: am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" 
* commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/
 2015-03-13 07:07:54 +00:00
Andreas Gampe
db64454b33 resolved conflicts for merge of b6b9fe21 to master 
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
 2015-03-13 00:04:10 -07:00
Deepanshu Gupta
28070f43a6 am a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'a4277e149355c53fde73a4e1ef44aa665af31cf0':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-13 06:33:44 +00:00
Rich Slogar
f9d525912c am 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '93d44992ecf41b8169391005f7d3d219785eef90':
  docs: build image updates
 2015-03-13 06:33:26 +00:00
Deepanshu Gupta
a53f76dcce am 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '3d024d4c22b896c95ef4c98610c3db7c58a639ed':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-13 06:33:17 +00:00
Deepanshu Gupta
1bbb9e1d5d am fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'fceec0e124a55b25d59f2af5279c70ac045d6771':
  Fix rare NPE in BridgeContext.
 2015-03-13 06:32:49 +00:00
Deepanshu Gupta
cfed1b5222 am ca9264ea: am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit 'ca9264eab03cf787fb4dfc62a2313d9c3b45a05e':
  Fix project settings.
 2015-03-13 06:32:40 +00:00
Andreas Gampe
d88a9bc821 resolved conflicts for merge of ef1741d2 to master 
Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751
 2015-03-12 23:25:27 -07:00
Andreas Gampe
b3fd7e1be6 resolved conflicts for merge of d93f4c8b to master 
Change-Id: Iec5cabbeb128a4696a8a670afbf2f4cb9ebdb2de
 2015-03-12 22:51:01 -07:00
Andreas Gampe
c81292964a am 26c95085: (-s ours) am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages" 
* commit '26c95085b37d8d1ddc25a8d4d50b54b0ae6242c9':
  Extracted a separate class to run dexopt on packages
 2015-03-13 03:20:32 +00:00
Jason Sams
8ab7eb4c02 am bb8c910f: am d2e4a166: Merge "Remove dead path code" 
* commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374':
  Remove dead path code
 2015-03-13 02:59:40 +00:00
Jeff Brown
942c474820 Don't allow clients to add FDs to Looper without callbacks. 
Bug: 10349083
Change-Id: Ia75e37bb1055559f6442f97c42ec109078e737b6
 2015-03-12 19:44:49 -07:00
Christopher Tate
388ff39313 Merge "Don't run full backups until package metadata has been pushed" 2015-03-13 01:27:35 +00:00
Christopher Tate
27aec3c54a Don't run full backups until package metadata has been pushed 
Bug 19692849

Change-Id: I13615db7408b5c6fbc787c4773103c052e70f0b2
 2015-03-12 18:24:30 -07:00
John Spurlock
63b9e8200e Merge "Volume policy updates." 2015-03-13 00:59:34 +00:00
Wenchao Tong
c3b022ded1 Merge "NetworkStatsService to adjust VPN stats before recording." 2015-03-13 00:54:09 +00:00
Craig Mautner
e8ef4af3df am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '5be1afedd8f2289ba047473b242cd0535a4493fe':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:53:51 +00:00
Craig Mautner
5be1afedd8 am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:46:51 +00:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording. 
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
 2015-03-12 17:43:41 -07:00
Hui Shu
d7c7e566aa Merge "Add API for WebView OffscreenPreRaster setting." 2015-03-13 00:38:47 +00:00
Craig Mautner
7151b1ef42 am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '98560bdf87ad5f97054b13d3c92954132584c7f7':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:37:32 +00:00
Craig Mautner
98560bdf87 am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:29:21 +00:00
Craig Mautner
bfcc60a3f0 am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '2825a9c618840c1cf3d59806a794674f12a7c7c6':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:22:33 +00:00
Craig Mautner
2825a9c618 am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:17:36 +00:00
Craig Mautner
470ad0fa1c Merge "Correct docs to specify leading slash in paths." into lmp-docs 2015-03-13 00:09:31 +00:00
Luan Nguyen
e72dca4901 am 6c881ec9: am 872a731e: am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit '6c881ec9d588202172c45f3152c15fe0069b0ebb':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-13 00:03:06 +00:00
Marco Nelissen
a80ac05f85 resolved conflicts for merge of 42f55d1e to master 
Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
 2015-03-12 16:17:45 -07:00
Hui Shu
b1ee70b149 Add API for WebView OffscreenPreRaster setting. 
BUG: 19592029
Change-Id: Ic903b823e5f7830e2cf2d4f3dd9a5458334648a3
 2015-03-12 16:04:07 -07:00
Wale Ogunwale
d58617b4f5 Merge "Protect against NPE for ActivityRecords without a stack." 2015-03-12 22:31:05 +00:00
Wale Ogunwale
ab48bc164f Merge "Revert "Revert "Remove activity and window stacks when last task is removed.""" 2015-03-12 22:30:49 +00:00
Wenchao Tong
8726e9a73e Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Wale Ogunwale
7d701174f4 Protect against NPE for ActivityRecords without a stack. 
A previous change allowed us to remove stack that no longer contained
any task. This was causing some NPE when an ActivityRecord.Token or
some other cached ActivityRecord later gets converted back to an
ActivityRecord and we try to access its stack.

Bug: 19552874
Change-Id: Ie9454bbce56591b337f97af40f8c00b8597becdf
 2015-03-12 15:03:22 -07:00
Roozbeh Pournader
4f831caa49 Merge "Fix negative touch word offset that caused crashing when selecting text" 2015-03-12 21:45:22 +00:00
Olawale Ogunwale
1d67698bb4 am 53729e29: Merge "Wait for opening apps ready before stopping freezing display" 
* commit '53729e2933540307b090e64ee89cbae26c67de8f':
  Wait for opening apps ready before stopping freezing display
 2015-03-12 21:38:41 +00:00
Olawale Ogunwale
2f95291689 am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions" 
* commit '1b4933d10eea59b091f263ebb3723f4d59a85d2b':
  Wait for visible wallpaper drawn before starting app transitions
 2015-03-12 21:38:30 +00:00
Roozbeh Pournader
8a264dd289 am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit '07e01e07bbfffa9e247a54dd96b3013de46d59e7':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 21:33:35 +00:00