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

153426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
4593ea4786 am efa85145: am 11942e90: am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev 
* commit 'efa851450a2e68ff47e1e8e15da26e046e2b4b7c':
  Update list preference layout to more closely match Material spec
 2014-08-27 04:34:31 +00:00
Chris Craik
4be698fad5 am 11ed894a: am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit '11ed894a043a193baa5ec004e0cf376eab9f21eb':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 04:34:26 +00:00
Jae Seo
d99216de51 am d105546b: am 4f14930b: am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev 
* commit 'd105546ba53df05b845bdce789138bba07cf5702':
  Revert "TIF: Temporarily disable permission check for parental controls"
 2014-08-27 04:34:21 +00:00
Svetoslav
890052f07f am f5b5d4a5: am c466f26d: am f25081e0: Merge "Fix a crash in PrintSpooler." into lmp-dev 
* commit 'f5b5d4a5ab3bb0961d2f7097d73a150a2fbe811e':
  Fix a crash in PrintSpooler.
 2014-08-27 04:34:16 +00:00
Craig Mautner
29833e0317 am 7cf6e4f3: am 9f936d6a: am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev 
* commit '7cf6e4f3e1d2dacee59534d6ace56f5f40472896':
  Show IME over keyguard if IME target is showing
 2014-08-27 04:34:11 +00:00
Christopher Tate
0cff332a68 am 569464bb: am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '569464bbdedb099616015351d1c8ee377f72d737':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:33:58 +00:00
Yorke Lee
2822d16b02 am 14407ed0: am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '14407ed0cc8d23c4bbf6609611d522c0986894c1':
  API changes for ContactsContract
 2014-08-27 04:33:54 +00:00
Jungshik Jang
fc40ddbbbc am 80b47f03: am d3d36ad4: am 7897e312: Merge "Add null-check for system audio mode change event." into lmp-dev 
* commit '80b47f037299a98ac0deb3bdaa056a29df1fb08e':
  Add null-check for system audio mode change event.
 2014-08-27 04:33:48 +00:00
Alan Viverette
771b4f4c5c am 11942e90: am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev 
* commit '11942e90b325e18afcd6d4d4100328425cc351d7':
  Update list preference layout to more closely match Material spec
 2014-08-27 04:20:35 +00:00
Chris Craik
287d2314da am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit 'f55719bcbaeb3b5b57759211e3ea0c99d21c27aa':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 04:20:30 +00:00
Jae Seo
22fdd1d2ec am 4f14930b: am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev 
* commit '4f14930bce11b1efeb36c16d3e35f9a9ff981fa2':
  Revert "TIF: Temporarily disable permission check for parental controls"
 2014-08-27 04:20:25 +00:00
Svetoslav
5bb6b996d4 am c466f26d: am f25081e0: Merge "Fix a crash in PrintSpooler." into lmp-dev 
* commit 'c466f26da82ba18fb91894129a37b565219c3cc4':
  Fix a crash in PrintSpooler.
 2014-08-27 04:20:20 +00:00
Craig Mautner
9ea9a37c81 am 9f936d6a: am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev 
* commit '9f936d6a6fa506f8bfc2916a426f1f197dd7c156':
  Show IME over keyguard if IME target is showing
 2014-08-27 04:20:16 +00:00
Christopher Tate
584cce1ce9 am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '663c889c750023e6c7109a57f33034a96432fd35':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:20:12 +00:00
Yorke Lee
84496c7706 am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit 'cca607410716197803663676526cf6368c58a7de':
  API changes for ContactsContract
 2014-08-27 04:20:06 +00:00
Jungshik Jang
ff2b18e1e3 am d3d36ad4: am 7897e312: Merge "Add null-check for system audio mode change event." into lmp-dev 
* commit 'd3d36ad41f12e8a0bfac69deacaa8da3ecefc9b1':
  Add null-check for system audio mode change event.
 2014-08-27 04:19:59 +00:00
Christofer Åkersten
070bf912a2 am c957fa3b: am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 
* commit 'c957fa3bcc42ebed337582f98c8ebb8f2d1148e5':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
 2014-08-27 03:26:37 +00:00
Christofer Åkersten
46dc0f5145 am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 
* commit '8ddbb2cf63f52af38a61faed5f58b89e2dc84aef':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
 2014-08-27 03:12:06 +00:00
Alan Viverette
94a3aa9d66 am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev 
* commit '39ee1a53af6e8bc73799fa384f6deca95e9e91b9':
  Update list preference layout to more closely match Material spec
 2014-08-27 03:01:19 +00:00
Chris Craik
e401dc02c3 am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit '7d3073a4b4685764fcdf8c90f90531ab698c9b58':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 03:01:13 +00:00
Jae Seo
0a2551d0c1 am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev 
* commit '16b98b6f7282c3c95cdd9ad4ecc878c95ceb3d43':
  Revert "TIF: Temporarily disable permission check for parental controls"
 2014-08-27 03:01:07 +00:00
Svetoslav
0e23dd870a am f25081e0: Merge "Fix a crash in PrintSpooler." into lmp-dev 
* commit 'f25081e063e495bf53ac0f5e1ea41b10231145e3':
  Fix a crash in PrintSpooler.
 2014-08-27 03:01:03 +00:00
Craig Mautner
d7ae9c5a47 am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev 
* commit 'e0515914937496003f19f1e76b8f1f2abbddf35c':
  Show IME over keyguard if IME target is showing
 2014-08-27 03:00:58 +00:00
Christopher Tate
115982fddb am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '7bd3661972e644d3b5fa550b9d8ba92de3f57696':
  Briefly log wallpaper restore outcomes
 2014-08-27 03:00:54 +00:00
Yorke Lee
2b6fababda am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '60a3817c487203ecaa4bf26b92d2c7a01ff568a6':
  API changes for ContactsContract
 2014-08-27 03:00:48 +00:00
Jungshik Jang
eea7d6dc50 am 7897e312: Merge "Add null-check for system audio mode change event." into lmp-dev 
* commit '7897e312e5dea491e217e902173362ab32d9058e':
  Add null-check for system audio mode change event.
 2014-08-27 03:00:41 +00:00
Paul Jensen
5b6ebdabc5 am 4ff3f2c9: am 254cb6b1: am 9a0a9fda: Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 
* commit '4ff3f2c9e974666d756398946bfcbd08d48d15f8':
  Fix to allow removing sign-in notification when network removed.
 2014-08-27 03:00:21 +00:00
Alan Viverette
ec7725c875 Merge "Update list preference layout to more closely match Material spec" into lmp-dev 2014-08-27 01:16:25 +00:00
Chris Craik
9ed43d6514 Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 2014-08-27 01:13:14 +00:00
Jae Seo
5d0ec89d55 Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev 2014-08-27 01:08:18 +00:00
Svetoslav
ab94674c70 Merge "Fix a crash in PrintSpooler." into lmp-dev 2014-08-27 01:01:55 +00:00
Craig Mautner
7dbfbc7d6b Merge "Show IME over keyguard if IME target is showing" into lmp-dev 2014-08-27 00:59:44 +00:00
Christopher Tate
1871b9352e Merge "Briefly log wallpaper restore outcomes" into lmp-dev 2014-08-27 00:56:19 +00:00
Yorke Lee
5edb638eed Merge "API changes for ContactsContract" into lmp-dev 2014-08-27 00:51:07 +00:00
Jae Seo
fc836f6684 Revert "TIF: Temporarily disable permission check for parental controls" 
This reverts commit 9d197941afcef7853578fcd2d704d6f97dde0902.

Change-Id: Ib376f3d4deddf72b94a5195f7aeafafd3ed189e8
 2014-08-27 00:47:56 +00:00
Christofer Åkersten
8ccb1d6ca7 am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 
* commit 'e7a964478d292fe70d1266bf3e1d36060e437c79':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
 2014-08-27 00:43:58 +00:00
Jungshik Jang
2b8e9504df Merge "Add null-check for system audio mode change event." into lmp-dev 2014-08-27 00:43:19 +00:00
Paul Jensen
5b79ba4394 am 254cb6b1: am 9a0a9fda: Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 
* commit '254cb6b1a6ddb79353fc7277dc3f281f8030d82c':
  Fix to allow removing sign-in notification when network removed.
 2014-08-27 00:43:05 +00:00
Christofer Åkersten
1e1b820539 Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 2014-08-27 00:37:11 +00:00
Deepanshu Gupta
795c1789ef Merge "Fix invalid conditional check in ResourceTypes." 2014-08-27 00:36:43 +00:00
Paul Jensen
c2b07c6ec3 am 9a0a9fda: Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 
* commit '9a0a9fda4024f0ac9611780b0af161c65d48b6a3':
  Fix to allow removing sign-in notification when network removed.
 2014-08-27 00:36:11 +00:00
Alan Viverette
000b1abca8 Update list preference layout to more closely match Material spec 
Expects icons to have 4dp of padding baked in, which is consistent with
existing icons.

BUG: 17235037
Change-Id: Ic855664e85454be5e0de030070eb6ab1594e2448
 2014-08-26 17:34:34 -07:00
Chris Craik
1d47742333 Crash instead of leaking layers/textures between GL contexts 
bug:17208461
Change-Id: I4d58f301cf0f5e8145e808a5d6ade4de7801970b
 2014-08-26 17:30:15 -07:00
Deepanshu Gupta
71909a62c5 Fix invalid conditional check in ResourceTypes. 
The check was always false. This wasn't really a problem since the regex
check later took care of it. But it's just wrong to leave such mistakes
in the code once they are noticed.

Change-Id: Id3dd602318d8c64d466bd0f102aa3af0a1c80189
 2014-08-26 17:23:19 -07:00
Yorke Lee
b31c8abdc4 API changes for ContactsContract 
* Hide NAME_VERIFIED
* Add PinnedPositions.pin

Bug: 17253963
Change-Id: I887fb291fa4de8db6859655956a80898d1ee618c
 2014-08-26 17:13:02 -07:00
Craig Mautner
99b69286f1 Show IME over keyguard if IME target is showing 
IME was being hidden by keyguard even if the window it was attached
to was showing. This change shows the IME if the window it is
attached to is hiding the keyguard.

Also fix an NPE that was crashing systemui.

Fixes bug 16457525.

Change-Id: If587eefa7b1e0ae26713906a76c0766ebaae69a6
 2014-08-26 17:10:39 -07:00
Christopher Tate
8ab0865156 Briefly log wallpaper restore outcomes 
Bug 17112780

Change-Id: I3e9a23d28c9df4f708eb24b4688322c21a8c8382
 2014-08-26 17:08:04 -07:00
Paul Jensen
e30735c7dc Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 2014-08-26 23:58:40 +00:00
Jeff Hao
d72790e900 am 92c7379c: am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit '92c7379cf75b6ddce98f03c223d14267227436d2':
  Add sample profiling option to am.
 2014-08-26 23:39:57 +00:00
Jeff Hao
2583ced835 am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit 'c4ef03d0144ca92957724d142c9511bcc5603094':
  Add sample profiling option to am.
 2014-08-26 23:25:44 +00:00