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

171357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
347040cf84 am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit '740acf213c56c406132294790fa2fadd0380cfa7':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-11 00:07:02 +00:00
Jason Monk
a349a9e71a am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:53 +00:00
Chris Craik
5369b76963 resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. 
Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991
 2014-12-10 15:23:54 -08:00
Adam Lesinski
740acf213c am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit 'c78018774503308e8c8266f6769c9e4c895f3a97':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-10 21:19:58 +00:00
Adam Lesinski
c780187745 Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 2014-12-10 21:12:04 +00:00
Jason Monk
65c08ec82a am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
  Handle policy change while keyguard disabled
 2014-12-10 21:11:30 +00:00
Jason Monk
4ef9edeb67 Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 2014-12-10 21:04:27 +00:00
Chris Craik
ed211b940b am f441557d: Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev 
* commit 'f441557d89cab8885940bb63a27159f576749f96':
  Fix frame-allocated path lifecycles
 2014-12-10 21:01:30 +00:00
Chris Craik
f441557d89 Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev 2014-12-10 20:53:46 +00:00
Benjamin Franz
16d73a752e am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 
automerge: df55bf4

* commit 'df55bf45e8ebcf699b9b4574db9119809935c549':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 20:36:22 +00:00
Benjamin Franz
df55bf45e8 am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 
* commit 'a96ba381cf7ecbed31da94b8ebc93da3c42151ad':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 20:34:36 +00:00
Benjamin Franz
a96ba381cf Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 2014-12-10 20:29:25 +00:00
Chris Craik
4ac36f80be Fix frame-allocated path lifecycles 
bug:18667472

Previously, we were allocating per-frame temporary paths within the
PlaybackStateStruct, but these are not safe as layers allocate these
transiently. Instead, move these to the OpenGLRenderer, which has
better define lifecycle.

Additionally, don't store SkPath objects directly in vector, since
they are then subject to relocation.

Change-Id: I8187ef542fcd5b030502bb75eb123ee26c0daa96
 2014-12-10 12:27:08 -08:00
Joe Fernandez
f9d2cd9931 am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
automerge: 15cfa4f

* commit '15cfa4f3012f9bdb39b0c9c0d339b3d76694abfa':
  docs: update debug menu for debugging-studio
 2014-12-10 20:04:31 +00:00
Joe Fernandez
15cfa4f301 am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
* commit '844af56b85260d9e6a8e89436a5e8862fbeb3812':
  docs: update debug menu for debugging-studio
 2014-12-10 20:02:29 +00:00
Joe Fernandez
e4e1687d73 am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs 
automerge: 4ded0a1

* commit '4ded0a166f96da7bcb377c0573ba373b77fe596e':
  docs:studio basic links
 2014-12-10 19:56:05 +00:00
Joe Fernandez
844af56b85 am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
* commit 'efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
  docs: update debug menu for debugging-studio
 2014-12-10 19:54:51 +00:00
Joe Fernandez
4ded0a166f am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs 
* commit '5a64a47580e9b384e83ba81e8f2cbb848497ac61':
  docs:studio basic links
 2014-12-10 19:54:35 +00:00
Joe Fernandez
efab8b6fd5 am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
* commit 'bdd6aabd1fd98762b22bb347d24c99e2c388d166':
  docs: update debug menu for debugging-studio
 2014-12-10 19:47:11 +00:00
Joe Fernandez
5a64a47580 am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs 
* commit '9727d1910052e600ebcf417c9fe55436ecf2c9de':
  docs:studio basic links
 2014-12-10 19:46:37 +00:00
Svet Ganov
a3bc48c863 am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev 
automerge: a706c90

* commit 'a706c9079a60531d79a3f32f263c37f386229564':
  Ignore accessibility overlay when computing window's interactive region.
 2014-12-10 19:43:33 +00:00
Svet Ganov
a706c9079a am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev 
* commit 'e39fc96c04a09a58acb2547a2066e0662791a69b':
  Ignore accessibility overlay when computing window's interactive region.
 2014-12-10 19:42:08 +00:00
Joe Fernandez
bdd6aabd1f am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
* commit 'd49977d967d7db24466abba9a97084a955f56aff':
  docs: update debug menu for debugging-studio
 2014-12-10 19:38:28 +00:00
Joe Fernandez
9727d19100 am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs 
* commit '534ae165f374d81335dc1b7742df1168c8d5ae36':
  docs:studio basic links
 2014-12-10 19:38:17 +00:00
Luan Nguyen
1032dac1f8 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
automerge: ee501ed

* commit 'ee501ed8483bc66fbff38769da921a37837297f2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:36:26 +00:00
Svet Ganov
e39fc96c04 Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev 2014-12-10 19:35:05 +00:00
Luan Nguyen
ee501ed848 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '596d4e7230ae1858aaafbae7987e46d65181f1bd':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:34:30 +00:00
Joe Fernandez
d49977d967 Merge "docs: update debug menu for debugging-studio" into lmp-docs 2014-12-10 19:31:12 +00:00
Joe Fernandez
534ae165f3 am 3454091d: Merge "docs:studio basic links" into lmp-docs 
* commit '3454091dad65256730b714d8ce0f89c137c1c0c2':
  docs:studio basic links
 2014-12-10 19:30:37 +00:00
John Spurlock
9e5e1cf2bb am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 
automerge: 24ca556

* commit '24ca556dcea46d21045485626a82e9c1ad244bd6':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 19:30:36 +00:00
Luan Nguyen
596d4e7230 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:26:37 +00:00
Dianne Hackborn
f85a91e408 am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
automerge: d525891

* commit 'd52589185f57ce7eb633d12dec98e4bbae4e33fd':
  Further work on issue #18640385: Add procstats test mode
 2014-12-10 19:26:35 +00:00
Geoff Mendal
4af46d6999 am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE 
automerge: da409fe  -s ours

* commit 'da409fea8230c49666ed634aeb7db629fb9425f3':
  Import translations. DO NOT MERGE
 2014-12-10 19:25:10 +00:00
Wink Saville
3a426694ff am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev 
automerge: afd6f5a

* commit 'afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 19:23:23 +00:00
Joe Fernandez
3454091dad Merge "docs:studio basic links" into lmp-docs 2014-12-10 19:23:16 +00:00
John Spurlock
24ca556dce am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 
* commit 'e03e245610c7f406a6cc0de998d71313a285953a':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 19:22:41 +00:00
Dianne Hackborn
9b287368b0 am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
automerge: 7557ec1

* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 19:21:58 +00:00
Geoff Mendal
71433a9047 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: e1bc1c6  -s ours

* commit 'e1bc1c6c9fb8d019813cd8866f5433bb3f4adb04':
  Import translations. DO NOT MERGE
 2014-12-10 19:20:38 +00:00
Geoff Mendal
94f01a767a am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 2f5e130  -s ours

* commit '2f5e130d4d16eb80e72e492230dec843e1d2c9b2':
  Import translations. DO NOT MERGE
 2014-12-10 19:19:18 +00:00
Luan Nguyen
c9e5c5f72a am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '8a65df39e6ad2fc357c8a327626f40588ce00553':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:19:05 +00:00
Craig Mautner
647130baac am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
automerge: 8642803

* commit '864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 19:17:53 +00:00
Jorim Jaggi
bcce183020 am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev 
automerge: 57b440e

* commit '57b440e206f142368bcf42885d3f3763554173e8':
  Fix SysUI when an app started from the affordances crashes
 2014-12-10 19:16:38 +00:00
Dan Sandler
9b0f0d1142 am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev 
automerge: b394253

* commit 'b394253a3f86df065783d5c07250c155428702e5':
  BluetoothControllerImpl: track bluetooth better
 2014-12-10 19:15:11 +00:00
John Spurlock
e03e245610 Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 2014-12-10 19:14:27 +00:00
Rich Slogar
bea1510573 docs: update debug menu for debugging-studio 
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
 2014-12-10 11:14:15 -08:00
Geoff Mendal
f26040f05a am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 4ce2c65  -s ours

* commit '4ce2c654bda8f2a78bf4821ea39b146e626c8b60':
  Import translations. DO NOT MERGE
 2014-12-10 19:13:46 +00:00
Geoff Mendal
1fb480998d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 83c26e1  -s ours

* commit '83c26e18fc05a07b84698cb02b7a077102f90335':
  Import translations. DO NOT MERGE
 2014-12-10 19:12:31 +00:00
Geoff Mendal
0840f961e5 am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 2a5f0b4  -s ours

* commit '2a5f0b4e3b144fa536c69cb80831b4a8678cc855':
  Import translations. DO NOT MERGE
 2014-12-10 19:11:10 +00:00
Luan Nguyen
8a65df39e6 am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '258da738463f547eab859c21d32cbfe0f8345ae2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:10:41 +00:00
Jason Monk
f8830fc514 am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 
automerge: 9309db8

* commit '9309db894df916f0777745eaa3e41ab92930481d':
  CarrierText clear itself when no mob. data support
 2014-12-10 19:09:42 +00:00