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

124934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
30164eee82 am 6886e3ac: am 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '6886e3ac185b4ee2d5e2cf054b4beb0d9c55b18f':
  Add methods for Time_Delegate
 2014-02-05 19:18:30 -08:00
Deepanshu Gupta
bd40c264cf am f7994e89: am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit 'f7994e89e94d55998e63e9ebe74a8f10c05ccb3a':
  Optimize layout rendering in layoutlib
 2014-02-05 19:18:27 -08:00
Deepanshu Gupta
748ca8dbc5 am a859670d: am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'a859670d0a135d9a33b57fcc450fafa09d9c5a7f':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-05 19:18:24 -08:00
Deepanshu Gupta
abbe45e81e am 3a9d89e2: am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit '3a9d89e28885d5d92423b9d28a1a2430b65e1559':
  Fix the measurement of text bounds.
 2014-02-05 19:18:21 -08:00
Deepanshu Gupta
dacbd2ac7c am 1c064691: am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit '1c06469101464c147058c01bc25c9e4b3c1aa16b':
  Fix a bug in Nine Patch library.
 2014-02-05 19:18:18 -08: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
Deepanshu Gupta
f9021e48be am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'bd762373964eb3cb71bdd79cbf82c27faa22699d':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-06 03:06:32 +00:00
Deepanshu Gupta
1bcc286def am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit 'db0427a0ac986e0823e7bbe9b7c12a97aabe133e':
  Fix the measurement of text bounds.
 2014-02-06 03:06:29 +00:00
Deepanshu Gupta
1bceb9823f am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit '650d30c5ec3c0b345651a56c45eb334fabf51b17':
  Fix a bug in Nine Patch library.
 2014-02-06 03:06:26 +00:00
Deepanshu Gupta
ea2ec77f95 am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '3adb34ee079504b5854d23bc7a38dafc0a985219':
  Add methods for Time_Delegate
 2014-02-06 03:03:54 +00:00
Deepanshu Gupta
a0023027e5 am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit '23de8dc2625d4aeb4dc9085c5865ed571f96261a':
  Optimize layout rendering in layoutlib
 2014-02-06 03:03:50 +00:00
Deepanshu Gupta
bd76237396 am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit '096e43590381b218cec88adeac4261427c19e139':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-06 03:03:45 +00:00
Deepanshu Gupta
db0427a0ac am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit '5800b19a7a3422620cb28e2327a96bf824f5cc9c':
  Fix the measurement of text bounds.
 2014-02-06 03:03:41 +00:00
Deepanshu Gupta
650d30c5ec am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit 'b156c0197d052dd4be71ad2b858acc01f50ad49f':
  Fix a bug in Nine Patch library.
 2014-02-06 03:03:36 +00:00
Craig Mautner
bca9aa172c am af04b113: am 14d74b82: am 1bf2b873: Defer detach until animations are complete. 
* commit 'af04b113dcd28ae788a3ffb4a5420817cb7ed95f':
  Defer detach until animations are complete.
 2014-02-05 19:00:16 -08:00
Craig Mautner
55e0da9326 am 643ca1e9: am 481b54be: am dc548483: Move activities from DisplayContent to TaskStack 
* commit '643ca1e9a3fba3b815534048bf4249a1f8a134b3':
  Move activities from DisplayContent to TaskStack
 2014-02-05 19:00:13 -08:00
Deepanshu Gupta
3adb34ee07 am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '9fcfbfe296d7033ee031171f61b3a33044abee42':
  Add methods for Time_Delegate
 2014-02-06 02:59:51 +00:00
Deepanshu Gupta
23de8dc262 am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit '28e049ef73f5d9301a198ac53535442b697b7ef4':
  Optimize layout rendering in layoutlib
 2014-02-06 02:59:48 +00:00
Deepanshu Gupta
096e435903 am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'f2f108fe86337a429a0940f264761dbc27f817fe':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-06 02:59:45 +00:00
Deepanshu Gupta
5800b19a7a am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16':
  Fix the measurement of text bounds.
 2014-02-06 02:59:41 +00:00
Deepanshu Gupta
b156c0197d am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit 'd5129e75968030620a1372e39fcfbc17fe584e17':
  Fix a bug in Nine Patch library.
 2014-02-06 02:59:38 +00:00
Deepanshu Gupta
9fcfbfe296 am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '3bf38b4165877274067a385cfe6472639a203a58':
  Add methods for Time_Delegate
 2014-02-06 02:56:45 +00:00
Craig Mautner
af04b113dc am 14d74b82: am 1bf2b873: Defer detach until animations are complete. 
* commit '14d74b82363e1a72b967590ee7118b239b276fb4':
  Defer detach until animations are complete.
 2014-02-06 02:56:44 +00:00
Deepanshu Gupta
28e049ef73 am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit '0db6e6a567e25d560586863c7be654a0c1da5795':
  Optimize layout rendering in layoutlib
 2014-02-06 02:56:42 +00:00
Deepanshu Gupta
f2f108fe86 am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'a955314d905f8567c852226ce4f74994826e8777':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-06 02:56:39 +00:00
Craig Mautner
643ca1e9a3 am 481b54be: am dc548483: Move activities from DisplayContent to TaskStack 
* commit '481b54be1acb990bab3933b6248964e351bdcd99':
  Move activities from DisplayContent to TaskStack
 2014-02-06 02:56:37 +00:00
Deepanshu Gupta
50b0ce4e8e am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit 'fd8cba3ab83972eefc796fa122b0ec9222078b1c':
  Fix the measurement of text bounds.
 2014-02-06 02:56:36 +00:00
Deepanshu Gupta
d5129e7596 am 8a892279: Fix a bug in Nine Patch library. 
* commit '8a892279bd1b212311f4200f306a317985463918':
  Fix a bug in Nine Patch library.
 2014-02-06 02:56:32 +00:00
Alan Viverette
1f9a3a862a am d5154ec2: Add prototype for borderless touch feedback drawable 
* commit 'd5154ec2bc7e7c0bdfd14fc784912d390afe43cc':
  Add prototype for borderless touch feedback drawable
 2014-02-05 18:55:43 -08:00
Deepanshu Gupta
3bf38b4165 Merge "Add methods for Time_Delegate" into klp-dev 2014-02-06 02:06:02 +00:00
Deepanshu Gupta
0db6e6a567 Merge "Optimize layout rendering in layoutlib" into klp-dev 2014-02-06 02:05:42 +00:00
Deepanshu Gupta
a955314d90 Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 2014-02-06 02:05:21 +00:00
Deepanshu Gupta
fd8cba3ab8 Merge "Fix the measurement of text bounds." into klp-dev 2014-02-06 02:04:49 +00:00
Alan Viverette
d5154ec2bc Add prototype for borderless touch feedback drawable 
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
 2014-02-05 17:53:33 -08:00
Deepanshu Gupta
8a892279bd Fix a bug in Nine Patch library. 
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.

Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
 2014-02-05 17:16:35 -08:00
Craig Mautner
14d74b8236 am 1bf2b873: Defer detach until animations are complete. 
* commit '1bf2b873470d2ba8a4ac218da73516cc2b20aa76':
  Defer detach until animations are complete.
 2014-02-06 01:00:35 +00:00
Craig Mautner
481b54be1a am dc548483: Move activities from DisplayContent to TaskStack 
* commit 'dc548483ae90ba26ad9e2e2cb79f4673140edb49':
  Move activities from DisplayContent to TaskStack
 2014-02-06 01:00:32 +00:00
John Spurlock
8662cab1ee am 0e29ad02: Merge "Global system setting to override certain window policy." 
* commit '0e29ad02f9ed46f2f2a9de59249969f9d1bdd7f6':
  Global system setting to override certain window policy.
 2014-02-05 16:56:17 -08:00
John Spurlock
0e29ad02f9 Merge "Global system setting to override certain window policy." 2014-02-06 00:53:42 +00:00
Dianne Hackborn
6946115e62 am 6eb0fdb9: Merge "Improve logging of first wake lock, history size." 
* commit '6eb0fdb99bc09210bea4df054a9c8a05daea3d1b':
  Improve logging of first wake lock, history size.
 2014-02-05 16:44:07 -08:00
Dianne Hackborn
6eb0fdb99b Merge "Improve logging of first wake lock, history size." 2014-02-06 00:41:49 +00:00
Dianne Hackborn
3d658bf20e Improve logging of first wake lock, history size. 
We now try to have a better label for the first wake lock
that is acquired in the log.  This is done in two ways:

- The alarm manager now sorts the alarms it is going to
  execute so that wakeup alarms are first, which are more
  important w.r.t. which one should be logged.
- There is a new power manager facility to make a wake lock
  as "unimportant for logging," which just means in battery
  stats that a wake lock acquired after that can be considered
  the actual one to log.  This is only used by the alarm manager
  to mark its TIME_TICK alarms as unimportant for logging.

Also reworked the battery history code to be cleaner and a bit
smaller.  There is no longer a separate EVENT command, instead
the event code and tag are just another thing that can be included
in an UPDATE command.

The bits used in the first history int are also re-arrange, so
that only the ones that really change a fair amount in the state
bits are up at the top and there is no longer space used for
the command code (since now it is always just UPDATE).  This
allows us to have more room for the time delta at the bottom,
to better avoid situations where we need to write an int delta.

Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
 2014-02-05 16:40:51 -08:00
Chong Zhang
3f889a5a26 am d7eab895: Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source" 
* commit 'd7eab895b76d96b1a8ef625ec927c4661972b425':
  MediaRecorderTest: add tests for getSurface() and SURFACE source
 2014-02-05 16:22:11 -08:00