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

162209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
c478cf5185 Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit 
No longer modify the base constants when computing oom adj values.

Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
 2015-01-05 16:05:05 -08: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
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
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
Deepanshu Gupta
4a5baeaec9 Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 2015-01-05 23:26:04 +00: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
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
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
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
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
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
Hui Shu
bb84515211 Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 2015-01-05 22:07:16 +00:00
Wale Ogunwale
170a678cd2 am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
* commit '1d893785bdd8af210eab861653e3e7664c728897':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:06:43 +00:00
Wale Ogunwale
1d893785bd Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev 2015-01-05 22:03:21 +00:00
Alan Viverette
bf80d2737f am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 
* commit '748902420d26b2868296303be7df89d0c25b7f2b':
  Don't override dialog icon drawable unless valid resource ID was set
 2015-01-05 21:43:27 +00:00
Alan Viverette
748902420d Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 2015-01-05 21:39:13 +00:00
Jason Monk
ad7cf95c60 am ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev 
* commit 'ee2e13e75356fbef806dfb69ccf995d7f616f027':
  Don't unregister MobileSignalControllers still used
 2015-01-05 21:15:51 +00:00
Jason Monk
7662f6ea8f am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
* commit 'b142b7552a6245606d93c43ce56ce81c700b3c09':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:15:46 +00:00
Jason Monk
ee2e13e753 Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev 2015-01-05 21:09:23 +00:00
Jason Monk
b142b7552a Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 2015-01-05 21:09:05 +00:00
Filip Gruszczynski
fe56835934 Add system api for disabling touch events in wallpaper behind the window. 
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
 2015-01-05 12:57:19 -08:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set 
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
 2015-01-05 12:56:45 -08:00
Jason Monk
c014decc74 Don't unregister MobileSignalControllers still used 
Also add some more testing for this section of code that manages
when MobileSignalControllers are added/removed to make sure we
are all good.

Bug: 18728593
Change-Id: I9902854c54d2e1deb58b38b7bd97dac1617831c0
 2015-01-05 15:53:00 -05:00
Alan Viverette
154d251ee6 am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev 
* commit '22a3163f1da8387e42c68c459f5667ac10744a3c':
  Fix selector bug
 2015-01-05 20:28:06 +00:00
Alan Viverette
22a3163f1d Merge "Fix selector bug" into lmp-mr1-dev 2015-01-05 20:23:47 +00:00
Alan Viverette
db7eefbbfd am dd508581: Use min when comparing AM and PM text lengths 
* commit 'dd508581216ef3ef47bd474316232f269db43f03':
  Use min when comparing AM and PM text lengths
 2015-01-05 20:06:32 +00:00
Deepanshu Gupta
58df125bbc Add image comparison to LayoutLib tests. 
The LayoutLib rendering tests now compares the rendered image with a
golden file from a previous execution. This will help catch any
unexpected changes in the final rendering.

Change-Id: I80251a778e89df7d7ec13863a8f299967f3d747d
 2015-01-05 11:32:41 -08:00
Alan Viverette
dd50858121 Use min when comparing AM and PM text lengths 
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.

BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
 2015-01-05 11:28:12 -08:00
Ricardo Cervera
e7d1db5632 am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'd69238ef032ec171f02d5b343802785474d35c37':
  docs: Minor fixes in Android Studio pages.
 2015-01-05 17:51:39 +00:00
Ricardo Cervera
d69238ef03 am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit '4bb503cf1209d113face24267d4ed2f19828aa3d':
  docs: Minor fixes in Android Studio pages.
 2015-01-05 17:43:43 +00:00