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

179489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
32176c4ca1 docs: Updated GMS version numbering to be consistent with blog post. 
bug: 18718181

Change-Id: I185157d84ebfe4ecc7b166b44d3d4735d8a106e3
 2015-01-05 15:55:13 -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
Ricardo Cervera
a9a514331c am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit 'f211b6257d3915054e7d92e9cfcb5eeaf3019b1a':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-05 23:38:03 +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
Deepanshu Gupta
a6671b7074 am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit '6461e05420c6f42b0e70134a4e0d2a626161ab74':
  Add image comparison to LayoutLib tests.
 2015-01-05 23:33:18 +00:00
Deepanshu Gupta
0db2524caa am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit 'b2ebb9683fb5b21543b50772a0d4c646ced7764b':
  Remove Time from CreateInfo
 2015-01-05 23:33:14 +00:00
Deepanshu Gupta
937db7a39e am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '53f73a97542c277a519b973060dfa217849b66de':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-05 23:33:10 +00:00
Deepanshu Gupta
e69e4f8b4d am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
  Fix DatePicker rendering.
 2015-01-05 23:33:06 +00:00
Deepanshu Gupta
8c686ddd54 am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7':
  Make Preference-cookie map non static.
 2015-01-05 23:33:02 +00:00
Deepanshu Gupta
cec8e5a10d am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'f861c0ce3ff42550f3d5ede837e7bfb3855f5964':
  Fix default initial value for preferences
 2015-01-05 23:32:58 +00:00
Deepanshu Gupta
7ed145493d am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
  Add preferences rendering.
 2015-01-05 23:32:53 +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
Ricardo Cervera
f211b6257d am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit 'fa6fb0daa5e6f9d3b0c17c8831c7525e403bd785':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-05 23:28:24 +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
Deepanshu Gupta
6461e05420 Merge "Add image comparison to LayoutLib tests." into lmp-dev 2015-01-05 23:24:59 +00:00
Deepanshu Gupta
b2ebb9683f Merge "Remove Time from CreateInfo" into lmp-dev 2015-01-05 23:24:31 +00:00
Deepanshu Gupta
53f73a9754 Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 2015-01-05 23:23:42 +00:00
Deepanshu Gupta
f9bb0b5e13 Merge "Fix DatePicker rendering." into lmp-dev 2015-01-05 23:23:33 +00:00
Deepanshu Gupta
d20a518c82 Merge "Make Preference-cookie map non static." into lmp-dev 2015-01-05 23:22:58 +00:00
Deepanshu Gupta
f861c0ce3f Merge "Fix default initial value for preferences" into lmp-dev 2015-01-05 23:22:45 +00:00
Deepanshu Gupta
7081a114d4 Merge "Add preferences rendering." into lmp-dev 2015-01-05 23:22:29 +00: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
Ricardo Cervera
fa6fb0daa5 docs: Minor fixes to Watch Faces design guidelines. 
Change-Id: I1b9c26d12bac1b5e5d649e7ea665f58b50d621d7
 2015-01-05 15:03:34 -08:00
Quddus Chong
1139a0a4a2 docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. 
bug: 18759727

Change-Id: Ided6dc4f30d43f8fce252e56a6291bbb1a3d2e05
 2015-01-05 15:01:27 -08: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
Rich Slogar
ee371073f1 docs: studio index typo 
Change-Id: I185e59cdba604ee894bc08f55ebb042281d44cd2
 2015-01-05 14:47:19 -08: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
Quddus Chong
5619d929a6 docs: Updated the description of the enhanced camera APIs in L. 
bug: 18142680

Change-Id: I0b15048bb099443a4cb790fbd2100456f2bfa4d6
 2015-01-05 14:15:45 -08:00
Wale Ogunwale
62fbd4feb1 am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
automerge: b8e5139

* commit 'b8e51390af6015c1eaff7679546a5a7d2dfa701d':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:14:47 +00:00
Hui Shu
e5cb6a253a am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 
* commit 'bb8451521196ce493e8827fd50ab84f3c776931d':
  pm path needs to return 0 when it succeeds.
 2015-01-05 22:14:40 +00:00