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

179202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
765ae116e2 am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs 
* commit 'eed87a573a2e67c85f5a8e79ad538cce278932d2':
  docs: project file and toc updates
 2015-01-06 02:01:01 +00:00
Joe Fernandez
596868b648 am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
* commit 'c811b88ab1bc891fffdef461ead0f6dc7331d04e':
  docs: studio workflow links
 2015-01-06 02:00:57 +00:00
Joe Fernandez
a78664e030 am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 
* commit '411c779bb746d81278b7646ffd96fa6e4f8336b9':
  docs: studio tips and ticks grammmar typo
 2015-01-06 02:00:53 +00:00
Ricardo Cervera
ac4444a26f am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
* commit 'c5fae9593553a89db2ad49306b46b8f9a3631489':
  docs: Update wearable lists docs
 2015-01-06 02:00:48 +00:00
Joe Fernandez
b1062ad68e am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
* commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060':
  docs: studio device emulator updates
 2015-01-06 02:00:42 +00:00
Sarah Maddox
15e94fdf34 am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
* commit '4811f9b84766adc17efb730160e15785d74875a3':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2015-01-06 02:00:32 +00:00
Ricardo Cervera
fcba64722b am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
* commit '9719336b3a9a059c31200137a93f74445d3c7185':
  docs: Adding vector drawables video
 2015-01-06 02:00:24 +00:00
Joe Fernandez
f3d9f03053 am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
* commit 'adaef486464af836cd3408657634c972419e4c80':
  docs: plugin reference update
 2015-01-06 02:00:14 +00:00
Alan Viverette
107a4719d5 am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 
automerge: 1c38711

* commit '1c38711bb45ea074b6456258079b18ba5c834ca6':
  Scroll handle was half as opaque as it was supposed to be
 2015-01-06 01:02:55 +00:00
Alan Viverette
1c38711bb4 am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 
* commit 'a5478449679366fa48b27ff722160477aeca6dc0':
  Scroll handle was half as opaque as it was supposed to be
 2015-01-06 01:00:40 +00:00
Alan Viverette
a547844967 am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 
* commit 'ccfd34f6b59cfd79746bb1698abafc458a83d6cb':
  Scroll handle was half as opaque as it was supposed to be
 2015-01-06 00:54:54 +00:00
Shishir Agrawal
8ddd54fb38 am 08fb858f: am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '08fb858f82c29467ba6e4bf1f54c56a4791b625d':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:54:34 +00:00
Chris Craik
b15f21effb Merge "Add overrides and switch to nullptr keyword for all files" 2015-01-06 00:50:53 +00:00
Chris Craik
d41c4d8c73 Add overrides and switch to nullptr keyword for all files 
Adds remaining missing overrides and nullptr usages, missed due to
an extreme failure in tool usage.

Change-Id: I56abd72975a3999ad13330003c348db40f59aebf
 2015-01-05 16:49:13 -08:00
Alan Viverette
ccfd34f6b5 Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 2015-01-06 00:49:09 +00:00
Shishir Agrawal
08fb858f82 am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '918866778f232ce07b1c2c2d6ea43bf5f0ce827f':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:48:11 +00:00
Shishir Agrawal
918866778f am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:43:09 +00:00
Shishir Agrawal
8955c54e0e Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 2015-01-06 00:37:07 +00:00
Sungsoo Lim
578efef682 am 31d73dce: am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 
automerge: c7ad8a6  -s ours

* commit 'c7ad8a61b8996d8e15adfca6dad7cf00a3d70a4a':
  DO NOT MERGE Fix typo
 2015-01-06 00:26:32 +00:00
Sungsoo Lim
c7ad8a61b8 am 31d73dce: am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 
* commit '31d73dce255db34e68ee77bba8c48541378004dd':
  DO NOT MERGE Fix typo
 2015-01-06 00:24:13 +00:00
Sungsoo Lim
31d73dce25 am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 
* commit '2bdf89b167d709e170150e5ae5bf888e6535c1fd':
  DO NOT MERGE Fix typo
 2015-01-06 00:18:35 +00:00
Sungsoo Lim
2bdf89b167 Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 2015-01-06 00:13:14 +00:00
Alan Viverette
c01678ea2d Scroll handle was half as opaque as it was supposed to be 
BUG: 18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
 2015-01-05 16:06:26 -08:00
Robert Greenwalt
0d2f2fb0be am 0994d12b: am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly" 
* commit '0994d12b0d37f81b4b5b619b82db6bc20b3b6384':
  Telephony: Initialize GsmCellLocation class members properly
 2015-01-05 23:42:50 +00:00
Deepanshu Gupta
02cab444fb am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 
automerge: f4d3973

* commit 'f4d3973c319502fc8aa3e1aa1d7e7502274ea3aa':
  resolved conflicts for a0bc2e7e to lmp-mr1-dev
 2015-01-05 23:39:03 +00:00
Robert Greenwalt
0994d12b0d am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly" 
* commit 'd38218d880f02951015733a3d3e00deb546465bf':
  Telephony: Initialize GsmCellLocation class members properly
 2015-01-05 23:39:01 +00:00
Deepanshu Gupta
f4d3973c31 am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 
* commit '9c8f8ed8a8bee42ee48a27b055b11ace6255d09a':
  resolved conflicts for a0bc2e7e to lmp-mr1-dev
 2015-01-05 23:36:57 +00:00
Robert Greenwalt
d38218d880 am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly" 
* commit 'b385e0b4923e9bd4663e6b3c976fbff105b343c3':
  Telephony: Initialize GsmCellLocation class members properly
 2015-01-05 23:33:37 +00:00
Chris Craik
a609028451 Merge "Make DisplayListRenderer inherit from Canvas, merge JNI" 2015-01-05 23:31:30 +00:00
Deepanshu Gupta
9c8f8ed8a8 am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4a5baeaec9294dbb43fe3b36a44b3176101756b6':
  resolved conflicts for a0bc2e7e to lmp-mr1-dev
 2015-01-05 23:30:18 +00:00
Robert Greenwalt
b385e0b492 Merge "Telephony: Initialize GsmCellLocation class members properly" 2015-01-05 23:28:23 +00:00
Deepanshu Gupta
4a5baeaec9 Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 2015-01-05 23:26:04 +00:00
Tom Hudson
8dfaa49042 Make DisplayListRenderer inherit from Canvas, merge JNI 
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.

Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.

bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
 2015-01-05 15:25:41 -08:00
Dianne Hackborn
5f86b66c9b am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
automerge: d17218e

* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:15:10 +00:00
Dianne Hackborn
24bc8d761a am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:09:07 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Alan Viverette
45c4bbbbce Allow use of theme attributes in color state lists 
BUG: 17384842
Change-Id: Ibdc413acbd00e37b908432abd55f6521c22b8fc9
 2015-01-05 14:59:19 -08:00
Filip Gruszczynski
2b37034c57 am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 
automerge: 62ab1ca

* commit '62ab1caa384fb17329891fbc24c959c7850e16c3':
  Add system api for disabling touch events in wallpaper behind the window.
 2015-01-05 22:59:09 +00:00
Filip Gruszczynski
62ab1caa38 am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 
* commit '8117eda6f18a4d388a12ab0af318c95b86280084':
  Add system api for disabling touch events in wallpaper behind the window.
 2015-01-05 22:56:09 +00:00
Filip Gruszczynski
8117eda6f1 am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 
* commit '8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
  Add system api for disabling touch events in wallpaper behind the window.
 2015-01-05 22:50:29 +00:00
Filip Gruszczynski
8c6b59f46d Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 2015-01-05 22:46:14 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android 
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
 2015-01-05 14:40:24 -08:00
Alan Viverette
8a3323adc8 am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 
automerge: 4d41e49

* commit '4d41e49f39322ae5ceee375e515636e29ed2dfbc':
  Avoid double-translating View background
 2015-01-05 22:40:24 +00:00
Alan Viverette
4d41e49f39 am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 
* commit 'bde76419c1c30aa574f8bc7b3f09f2029e080b83':
  Avoid double-translating View background
 2015-01-05 22:38:57 +00:00
Alan Viverette
bde76419c1 am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 
* commit '1f3f47b3680547dbb764db173e02d833e12d65a2':
  Avoid double-translating View background
 2015-01-05 22:32:10 +00:00
Alan Viverette
1f3f47b368 Merge "Avoid double-translating View background" into lmp-mr1-dev 2015-01-05 22:26:54 +00:00
Hui Shu
5895867801 am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 
automerge: 9bd1382

* commit '9bd1382f210732f406e497883dc8f4039f8d33d9':
  pm path needs to return 0 when it succeeds.
 2015-01-05 22:21:51 +00:00
Alan Viverette
b15703c9b4 Avoid double-translating View background 
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.

BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
 2015-01-05 14:20:42 -08:00
Hui Shu
9bd1382f21 am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 
* commit 'e5cb6a253afa8faffb85c73779a78c74aead23ae':
  pm path needs to return 0 when it succeeds.
 2015-01-05 22:20:28 +00:00