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

123227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
68ac5cef63 Merge "Battery stats: more events, fixes." 2014-02-07 21:56:45 +00:00
Dianne Hackborn
eaf2ac464b Battery stats: more events, fixes. 
Add new history events for top application package and
foreground application packages.

Doing this involved a fair amount of improvement to history
events.  The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active.  With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.

Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits.  These packing structures are changed to work
together correctly.

Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
 2014-02-07 13:45:01 -08:00
Derek Sollenberger
8852ab4357 Merge "Keep the SkPaint used when creating a layer." 2014-02-07 20:52:22 +00:00
John Spurlock
876e359b48 Merge "Make QS battery composite color match others." 2014-02-07 19:25:20 +00:00
Chris Craik
27bfb24518 Merge "Rework and clean up DisplayList projection" 2014-02-07 18:47:57 +00:00
Derek Sollenberger
d44fbe55a9 Keep the SkPaint used when creating a layer. 
This will allow us to inspect the paint for thing other than
color and xfermode, such as SkColorFilters and SkShaders.

bug: 10650594
Change-Id: I2c3ddd07a3966e1e77af34136307e2b59b2898c1
 2014-02-07 13:33:29 -05:00
Kenny Root
1a88d834e8 KeyChain: add explicit package for getPrivateKey 
Bug: 9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
 2014-02-07 09:14:32 -08:00
Narayan Kamath
8f52fee060 Merge "Fix several bad function definitions." 2014-02-07 11:34:19 +00:00
Jim Miller
ba7d94b8f3 Fix problem where input wasn't being requested 
This fixes a bug where input wasn't being enabled when the security
method changed.  The solution is to propagate changes back to the parent

Add missing copyright header to simplified keyguard view.

Bugs 12135931, 12879769

Change-Id: I0fc6cf8ef3b628c96a045797a5b9cdecd3a1007a
 2014-02-06 16:13:42 -08:00
Jim Miller
5e612cf078 Add KeyguardSimpleHostView and make it the default 
This adds a simplified KeyguardHostView that's intended to
be used as an overlay or dialog for asking the user's
credentials.

Bug 12135931

Change-Id: Iecede0715d671e88024e7bb77e7432cd1c7ec356
 2014-02-06 16:13:42 -08:00
Jim Miller
3eb4971b67 Move launch, verification and menu logic to base class 
- Add simplified KeyguardHostView
- Move common functions to KeyguardViewBase.java
- Create new KeyguardSimpleHostView class for simplified view
implementation.

Bug 12135931

Change-Id: I8d6b0a61c36a0c7ceb87da4da54b1dfbed0054ff
 2014-02-06 16:13:41 -08:00
Chris Craik
1df26446b7 Rework and clean up DisplayList projection 
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.

Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).

Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
 2014-02-06 16:07:37 -08:00
Chris Craik
fdace4e238 Merge "Simplify DisplayList matrices" 2014-02-06 23:22:28 +00:00
Adam Powell
6250c59e0d Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 2014-02-06 22:41:14 +00:00
Ricardo Cervera
1d2b0c008b am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'adb940131adf137023006fcd86663fd048fa6a54':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:29:59 +00:00
Ricardo Cervera
6232c3caf5 am a5e35cb0: am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'a5e35cb002936291b79ff422c94eb2caabedfb3a':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:26:03 +00:00
Ricardo Cervera
adb940131a am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8ff1f285c93a1a44a7419ab216bee2f92518387a':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:23:40 +00:00
Ricardo Cervera
8ff1f285c9 am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'b7d456d4a410d1a17933ed0256fecd2144160615':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:20:28 +00:00
Ricardo Cervera
a5e35cb002 am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '6ed268623b9e4a10a080e15d64340c16d2dd8a28':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:19:50 +00:00
Ricardo Cervera
b7d456d4a4 am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:17:12 +00:00
Ricardo Cervera
6ed268623b am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '74d290fd62dfec09708664f354805c548b3dc5eb':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:16:28 +00:00
Ricardo Cervera
8d65fc2c69 am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8756b0c3cea50d47ba7191d8a493f774b23a1631':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:13:29 +00:00
Ricardo Cervera
74d290fd62 am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'd057fa6d40198e07844f702608b7959bad3bd48b':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:13:21 +00:00
Ricardo Cervera
d057fa6d40 am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '531939d151167e56b3106205f4c3d859a9f509ce':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:09:36 +00:00
Ricardo Cervera
8756b0c3ce Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 2014-02-06 21:09:12 +00:00
Ricardo Cervera
531939d151 Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 2014-02-06 21:07:09 +00:00
Craig Mautner
c667f054d5 am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing. 
* commit '43ef013cbd769533737135af5a338898cc619602':
  DO NOT MERGE. Test for Configuration differences before changing.
 2014-02-06 20:36:56 +00:00
Craig Mautner
43ef013cbd am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing. 
* commit '38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
  DO NOT MERGE. Test for Configuration differences before changing.
 2014-02-06 20:29:49 +00:00
Craig Mautner
38f7dcd7dc DO NOT MERGE. Test for Configuration differences before changing. 
Changing Configuration first and then testing for changes yields a
result indicating no change.

Fixes bug 12904769.

Change-Id: If7e39e843f15b1143d9877497d595511afabd020
 2014-02-06 12:27:20 -08:00
John Reck
393fdbec9f Merge "Remove overdraw counter" 2014-02-06 20:26:37 +00:00
Adam Lesinski
9f97de1335 am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev 
* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
  Check feature bits before loading optional services
 2014-02-06 20:25:51 +00:00
Adam Lesinski
a5a93f559d am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev 
* commit '7f416631413e75a1756bd316a2e1906725d72f24':
  Check feature bits before loading optional services
 2014-02-06 20:16:30 +00:00
Adam Lesinski
7f41663141 Merge "Check feature bits before loading optional services" into klp-modular-dev 2014-02-06 20:13:21 +00:00
John Reck
593b19a49e Remove overdraw counter 
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
 2014-02-06 11:26:23 -08:00
Ricardo Cervera
893ee42c72 docs: Updated the retaining an object during conf change. Bug: 10303533 
Replaced use of deprecated methods with retained fragments.

Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
 2014-02-06 10:57:36 -08:00
Jeff Sharkey
2b1252ddd2 Merge "Update DrmOutputStream to use raw FileDescriptor." 2014-02-06 18:50:05 +00:00
Craig Mautner
d1c2c54211 Test for Configuration differences before changing. 
Changing Configuration first and then testing for changes yields a
result indicating no change.

Fixes bug 12904769.

Change-Id: If7e39e843f15b1143d9877497d595511afabd020
 2014-02-06 10:31:41 -08:00
Ricardo Cervera
56d37fb8cd docs: Fixed links to Proguard manual. Bug: 12713887 
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.

Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html

Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
 2014-02-06 09:49:04 -08:00
Jeff Sharkey
ebf8ad5d91 Update DrmOutputStream to use raw FileDescriptor. 
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.

Also return flag indicating if deleteOlderFiles() actually deleted
anything.  Update tests to verify.

Bug: 5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
 2014-02-06 09:47:38 -08:00
Andreas Huber
b341a24b2a Merge "Remove no longer needed http proxy handling code, it's obsolete now" 2014-02-06 17:10:31 +00:00
Narayan Kamath
017546e652 Fix several bad function definitions. 
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271
Change-Id: I6a167a4f3aac1e22ddea33d067caaef6a11b418c
 2014-02-06 11:50:31 +00:00
Jessica Hummel
e33e2ca346 Merge "Extend DeviceOwner concept to accommodate ProfileOwners" 2014-02-06 10:23:00 +00:00
Adam Connors
776c555d95 Extend DeviceOwner concept to accommodate ProfileOwners 
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.

Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
 2014-02-06 10:07:19 +00:00
Deepanshu Gupta
6886e3ac18 am 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '7bd287b70a1c95c96663a6028e9809fd3844f55a':
  Add methods for Time_Delegate
 2014-02-06 03:15:37 +00:00
Deepanshu Gupta
f7994e89e9 am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit '6a9cbd5a2d56782e94b870735df51d32314684d8':
  Optimize layout rendering in layoutlib
 2014-02-06 03:15:33 +00:00
Deepanshu Gupta
a859670d0a am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'f9021e48bedc9fda9bff4e33244e689fb06e8ecb':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-06 03:15:30 +00:00
Deepanshu Gupta
3a9d89e288 am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit '1bcc286def646f98747bce2c4dedb0737d5fcf9d':
  Fix the measurement of text bounds.
 2014-02-06 03:15:26 +00:00
Deepanshu Gupta
1c06469101 am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit '1bceb9823f7af258489c91fa201214805744fa4a':
  Fix a bug in Nine Patch library.
 2014-02-06 03:15:22 +00:00
Deepanshu Gupta
7bd287b70a am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit 'ea2ec77f9538de2ea795d3e257f19e8cff659665':
  Add methods for Time_Delegate
 2014-02-06 03:06:38 +00:00
Deepanshu Gupta
6a9cbd5a2d am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit 'a0023027e5b7245e2cef304d96826a7ae1c361aa':
  Optimize layout rendering in layoutlib
 2014-02-06 03:06:35 +00:00