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

184194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Luan Nguyen
55cff0b419 am 3df87bac: am 5228d083: am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '3df87baca9b62acdd425ea2dc8ae390e311ae6a3':
  docs: Update auto landing and design page image assets
 2015-03-12 21:33:28 +00:00
Rich Slogar
7f92c27ff8 am 964b4018: am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '964b4018499a0e1a50364f81f576a7181252841a':
  docs: eclipse revisions update
 2015-03-12 21:33:21 +00:00
Andrew Solovay
f3bc27fd02 am fd9d8c7b: am e5fd6c76: am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit 'fd9d8c7bcb81c31b7b43eb4f88ab8fc583ea9ac2':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-12 21:33:14 +00:00
Jeff Brown
c3eea84a0b Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O."" 2015-03-12 21:25:40 +00:00
Jeff Brown
0f0b7f2fb3 Revert "Update ParcelFileDescriptor to use non-blocking I/O." 
Bug: 19715279
This reverts commit a34a3bdcbf2e7057d294a8699bbe1be880500f6d.

Change-Id: Ief03dee1c0a2b4d906797a5c279663c17439c347
 2015-03-12 21:25:00 +00:00
Vishwath Mohan
1808d437e6 Merge "Enforce null-termination in ResStringPool::stringAt" 2015-03-12 21:17:50 +00:00
Yin-Chia Yeh
d6ee06a0c8 Merge "Camera: add @hide API for setting camera rotation" 2015-03-12 20:36:49 +00:00
Prashant Malani
737298b93e am 276d1bc9: am a98c21a6: Make circular mask thickness configurable 
* commit '276d1bc929485e53ba4d4e93d4cc3ded3fcc2fc3':
  Make circular mask thickness configurable
 2015-03-12 20:31:52 +00:00
Justin Koh
efac42a019 am e011eb4f: am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev 
* commit 'e011eb4ff9a082de69fea747141764de2f6f3dcc':
  Add translatable=false to dozeComponent
 2015-03-12 20:31:41 +00:00
Mady Mellor
27d6b97f63 Fix negative touch word offset that caused crashing when selecting text 
Previously the offset between the touch event and the start / end of
the word could result in a negative value - we don't care or want
this value to be negative. The negative value also causes the returned
offset to be outside the bounds of the text which resulted in a crash.

Bug: 19705184
Change-Id: I4287df7778c246dd10654f1a1f1e57538e940730
 2015-03-12 19:24:26 +00:00
Ronghua Wu
67cf4a06c7 Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager." 2015-03-12 18:05:47 +00:00
John Spurlock
a48d779dad Volume policy updates. 
- Make volume policy settable by the volume UI instead
   of hardcoded in AudioService.
 - Add status bar icon for silent mode.
 - Limit unmute-on-volume-adjust behavior to tvs.
 - Ensure all changes to device volume are sent through
   setIndex so no change events are missed.

Bug: 19260237
Change-Id: Iea070a7a6f90ff620e39629f2da3f33f87223d72
 2015-03-12 13:57:08 -04:00
Roozbeh Pournader
07e01e07bb am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit '11b6e2358aac68691f016fca07ee82be3e815f2b':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:52:54 +00:00
Roozbeh Pournader
11b6e2358a am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit 'db56b5a681b097f7649937e8ad4d73c1e560fb3b':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:43:42 +00:00
Olawale Ogunwale
53729e2933 Merge "Wait for opening apps ready before stopping freezing display" 2015-03-12 16:51:19 +00:00
Olawale Ogunwale
1b4933d10e Merge "Wait for visible wallpaper drawn before starting app transitions" 2015-03-12 16:22:07 +00:00
Roozbeh Pournader
db56b5a681 Move Noto Sans Tai Le to the end of the font fallback list. 
This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.

Also remove the old comment about 64k glyphs limit.

Bug: 19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
 2015-03-12 15:45:32 +00:00
Filip Gruszczynski
c6ee744a90 Merge "Allow polling for WindowInsets." 2015-03-12 15:12:45 +00:00