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

218347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Jensen
554cecea4c am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:33:13 +00:00
Paul Jensen
4cbfe3316f am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:21:27 +00:00
Paul Jensen
10a7d7449d am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:21:22 +00:00
Paul Jensen
773d71e7c4 am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5 am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:06:32 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:06:27 +00:00
Paul Jensen
ece4ac2105 Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev 2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314 Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 2015-09-23 10:58:57 +00:00
Nicolas Prévot
daa838390c Merge "Add more methods that take a userId to PackageManager." 2015-09-23 09:49:29 +00:00
Baligh Uddin
4b23a8149b Import translations. DO NOT MERGE 
Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import
 2015-09-23 01:54:57 -07:00
Baligh Uddin
3730fa2756 Import translations. DO NOT MERGE 
Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3
Auto-generated-cl: translation import
 2015-09-23 01:44:04 -07:00
Baligh Uddin
c5c9bdb08d Import translations. DO NOT MERGE 
Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc
Auto-generated-cl: translation import
 2015-09-23 01:31:31 -07:00
Baligh Uddin
5115b26935 Import translations. DO NOT MERGE 
Change-Id: Ia019f181e358d2925493075488bea307f7131215
Auto-generated-cl: translation import
 2015-09-23 01:23:51 -07:00
Justin Harrison
32d247a098 am b869cbe7: am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit 'b869cbe75a00eac69e31434813d3d33dc16988e9':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:32:55 +00:00
Justin Harrison
b869cbe75a am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit 'e2153b9741c7d9c3910c9355ae3bf6ec4f5c231b':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:25:34 +00:00
Justin Harrison
e2153b9741 am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit '184440cea399d2332b5dc138a9e8a47e9cde3398':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:18:04 +00:00
Justin Harrison
184440cea3 am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 
* commit '47cae24077015c5226f5b2d00ebe841ccbaed2d6':
  Extended the maximum pulsing duration when dozing
 2015-09-23 06:07:47 +00:00
Justin Harrison
47cae24077 Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev 2015-09-23 06:00:24 +00:00
Michael Lentine
d1f4f3787d am 80743d2b: am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev 
* commit '80743d2ba46f862d8ad910aed54452fae3759fc8':
  Dismiss color fade when it is no longer used.
 2015-09-23 05:48:04 +00:00
Michael Lentine
80743d2ba4 am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev 
* commit '0f3d0612b649731a084a791a6cc6fa1b74fcd1a1':
  Dismiss color fade when it is no longer used.
 2015-09-23 05:41:35 +00:00
Michael Lentine
0f3d0612b6 am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev 
* commit '0d93002af027044070a554d553ab524564404b18':
  Dismiss color fade when it is no longer used.
 2015-09-23 05:33:05 +00:00
Michael Lentine
0d93002af0 am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev 
* commit '17a764431a71ff91cbd9272d592fdcd15a9c7539':
  Dismiss color fade when it is no longer used.
 2015-09-23 05:25:58 +00:00
Michael Lentine
17a764431a Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev 2015-09-23 05:19:19 +00:00
Baligh Uddin
effcd9f4ac Import translations. DO NOT MERGE 
Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import
 2015-09-22 21:42:46 -07:00
Wale Ogunwale
13a9b16dc7 Only place new task in focus stack if it is full screen stack. 
The fullscreen stack is the only stack that can contain any task
regardless of if the task is resizeable or not. So, we don't want
to place any random new task in a non-fullscreen stack that has
focus as you can end up with issue like a non-resizeable task
ending up in the freeform stack and gets resized and the window
decor.

Bug: 23626353
Change-Id: Id2f151449f612b4f81ff85b42c375254871f6ec2
 2015-09-22 21:38:51 -07:00
Wale Ogunwale
eb8e56c8bb Don't resize task in current stack when moving it to a docked stack 
The creation of a docked stack resizies all other stacks and thier
resizeable tasks. This will cause a task we are moving to a docked
stack to be initially resized in the current stack before it is
moved to the docked stack. We now disable resizeablility on the
task we are moving during the creation of a stack so we don't
resize it in the current stack.

Bug: 23978723
Change-Id: Ibb1c6d2a8493971a6cbccd782a378459fedcb162
 2015-09-22 20:38:16 -07:00
Soonil Nagarkar
59a4a53c4f am cc456c7f: am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit 'cc456c7fda260808c138caf4015697d42f497d2c':
  Fix reintroduction of b/10845061
 2015-09-23 02:21:59 +00:00
Jorim Jaggi
3254d7c2b3 am 7e94ae83: am 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock 
* commit '7e94ae833f34917cc2a034a5f5be31a8cecb2553':
  Fix verifyUnlock
 2015-09-23 02:21:52 +00:00
Jorim Jaggi
2a9d6cca7c am a098d0f4: am 249d2388: am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture 
* commit 'a098d0f41c44c688a4540af01cd4817e47a1f324':
  Log time difference between power button presses for gesture
 2015-09-23 02:21:44 +00:00
Soonil Nagarkar
cc456c7fda am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit '7b9bcf02e1954b48a80a9e43df5b25d875172730':
  Fix reintroduction of b/10845061
 2015-09-23 02:11:55 +00:00
Jorim Jaggi
7e94ae833f am 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock 
* commit '1bdfd1284151ba0b4afae11f70ee90208f0a1633':
  Fix verifyUnlock
 2015-09-23 02:11:49 +00:00
Jorim Jaggi
a098d0f41c am 249d2388: am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture 
* commit '249d2388d601f59c1aa45c30c023794d5af0c2e0':
  Log time difference between power button presses for gesture
 2015-09-23 02:11:44 +00:00
Soonil Nagarkar
7b9bcf02e1 am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit 'fd5cb76ed654998df466147c19ec985115749e70':
  Fix reintroduction of b/10845061
 2015-09-23 02:06:09 +00:00
Jorim Jaggi
1bdfd12841 am 6da88610: am 302475e9: Fix verifyUnlock 
* commit '6da88610cea1e5f815e2d56979f54808c02a652f':
  Fix verifyUnlock
 2015-09-23 02:06:03 +00:00
Jorim Jaggi
249d2388d6 am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture 
* commit '7ef6b8d7449c1cf629e227a948f72bf73fcddb57':
  Log time difference between power button presses for gesture
 2015-09-23 02:05:56 +00:00
Soonil Nagarkar
fd5cb76ed6 am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 
* commit '79490dbacd90a851ed8d03d64acedbf3616adba4':
  Fix reintroduction of b/10845061
 2015-09-23 01:58:11 +00:00
Jorim Jaggi
6da88610ce am 302475e9: Fix verifyUnlock 
* commit '302475e93ce00287770aba9668acbe86e8b20a05':
  Fix verifyUnlock
 2015-09-23 01:58:01 +00:00
Jorim Jaggi
7ef6b8d744 am 1b68e8b7: Log time difference between power button presses for gesture 
* commit '1b68e8b711281a65c73006f10fdc2fdf2379ad60':
  Log time difference between power button presses for gesture
 2015-09-23 01:57:55 +00:00
Soonil Nagarkar
79490dbacd Merge "Fix reintroduction of b/10845061" into mnc-dr-dev 2015-09-23 01:34:53 +00:00
Jorim Jaggi
302475e93c Fix verifyUnlock 
Bug: 23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a
 2015-09-23 00:57:50 +00:00
Jan Nordqvist
52eb29f082 Hotspot 2.0 relase 2 first cut. 
CP mods to take a URL as a parameter, and new ScanInfo object.

Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
 2015-09-22 17:24:22 -07:00
Chih-hung Hsieh
53b069507a Merge "Remove unused local variable." 2015-09-23 00:05:16 +00:00
Jorim Jaggi
1b68e8b711 Log time difference between power button presses for gesture 
Bug: 24304031
Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf
 2015-09-22 17:05:12 -07:00
Chih-Hung Hsieh
93108b6164 Remove unused local variable. 
Found by clang/llvm for bullhead device.

Change-Id: I9225bd47f2b246bcc2cadf88da5974624831d9b8
 2015-09-22 16:32:39 -07:00
Wale Ogunwale
7794c359c7 Merge "Fixed issue with stack size when rotating screen." 2015-09-22 23:29:03 +00:00
Wale Ogunwale
9474421a56 Fixed issue with stack size when rotating screen. 
Stack bounds needs to be adjusted when the screen is rotated
so it occupies the same bounds on screen.

Change-Id: Id00031f2e1275f2d095f6e6b2e76b5b5d5c13864
 2015-09-22 16:27:07 -07:00
Wale Ogunwale
58a32f3155 Merge "Properly size tasks based on stack size." 2015-09-22 23:24:04 +00:00
Wale Ogunwale
a6e902ec61 Properly size tasks based on stack size. 
There were a few places we weren’t doing this correctly

* When a new task is created the bounds should be the stack bounds
if the task is resizeable and not in freeform mode.
* When resizing a stack each task in the stack should be resized
base on if it is resizable vs. using the top running activity in
the stack to determine if all the tasks should be resized.

Change-Id: If3448c5629313e7e7fb91ffe8506014f16ad72db
 2015-09-22 16:19:04 -07:00
Steve McKay
3be3aedb95 Merge "Update RecentsCreateView to use RecyclerView." 2015-09-22 23:13:11 +00:00