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

220142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
0b2f041122 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 
am: 8deb694779

* commit '8deb6947795426a3379c7487ac3aeb6cdce5e58d':
 2015-10-21 15:02:13 +00:00
Paul Lawrence
eab4352d9b Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce 
am: 29c5fb2646

* commit '29c5fb2646dd0bc0f2fa8b3b98f0893d7d57469b':
  Don't include password on default encryption command
 2015-10-21 15:00:58 +00:00
Geoff Mendal
03c5ec76d6 Import translations. DO NOT MERGE am: fde4111eea -s ours 
am: c37fe84736  -s ours

* commit 'c37fe847361b91dcabe47673a9145b7f7b52fb51':
  Import translations. DO NOT MERGE
 2015-10-21 14:59:34 +00:00
Geoff Mendal
da0905f120 Import translations. DO NOT MERGE am: 0705d75d69 -s ours 
am: c1fe7bdce5  -s ours

* commit 'c1fe7bdce5721ffe626881c4230e0a91288c834f':
  Import translations. DO NOT MERGE
 2015-10-21 14:59:12 +00:00
Paul Lawrence
8deb694779 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-21 14:53:48 +00:00
Paul Lawrence
29c5fb2646 Merge "Don\'t include password on default encryption command" into mnc-dr-dev 
am: 68521fd7ce

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command
 2015-10-21 14:53:23 +00:00
Paul Lawrence
3379409c67 Merge "Don\'t include password on default encryption command" into mnc-dr-dev 
am: 68521fd7ce

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command
 2015-10-21 14:50:51 +00:00
Geoff Mendal
c37fe84736 Import translations. DO NOT MERGE 
am: fde4111eea  -s ours

* commit 'fde4111eea4b92fbc10c9d6da7eaaa349292d9ec':
  Import translations. DO NOT MERGE
 2015-10-21 14:49:03 +00:00
Geoff Mendal
c1fe7bdce5 Import translations. DO NOT MERGE 
am: 0705d75d69  -s ours

* commit '0705d75d69e359edcdce9f6991eb52f8dcb421ed':
  Import translations. DO NOT MERGE
 2015-10-21 14:49:01 +00:00
Andrei Stingaceanu
2aaeefec92 Fix toolbar flickering in ExtractedMode when longpressing. 
onPreDraw starts an action mode in extract mode only which
does not consider the type of motion event and since extracted
mode never gets the focus event it never hides so it does not
need to show again.

Stop starting an action mode onPreDraw in extracted mode and
let the onTouchEvent handle starting the mode.

Also re-enabled dragging and dropping for ExtractedMode (most
of the issues were caused by starting the action mode
onPreDraw).

Bug: 25102276
Change-Id: I90d8e9f42f395b6b529e4d023ba6939e0dfb147f
 2015-10-21 15:42:00 +01:00
Paul Lawrence
68521fd7ce Merge "Don't include password on default encryption command" into mnc-dr-dev 2015-10-21 14:27:33 +00:00
John Reck
075f9ce097 Merge "Fix a few view ctors to not call Looper.myLooper" 2015-10-21 14:25:47 +00:00
Geoff Mendal
fde4111eea Import translations. DO NOT MERGE 
Change-Id: I03353dbedeb1204ce7cd07577257aa070ce19b2f
Auto-generated-cl: translation import
 2015-10-21 07:18:52 -07:00
Geoff Mendal
461d444b8f Merge "Import translations. DO NOT MERGE" 2015-10-21 13:14:59 +00:00
Geoff Mendal
40c412535d Import translations. DO NOT MERGE 
Change-Id: I72e8ad8a6c333a4f8c70f0bbbcb51be65ba0b831
Auto-generated-cl: translation import
 2015-10-21 06:10:51 -07:00
Geoff Mendal
d9892a1ee3 Import translations. DO NOT MERGE 
Change-Id: I1672581f5b8bd242f7c6a3daa9d09b772cce072c
Auto-generated-cl: translation import
 2015-10-21 05:35:53 -07:00
Geoff Mendal
0705d75d69 Import translations. DO NOT MERGE 
Change-Id: Idaba78408b31b9161ac35fbcf940266b491ee296
Auto-generated-cl: translation import
 2015-10-21 05:14:07 -07:00
Lorenzo Colitti
d913112189 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49 am: 18ec0b5187 
am: d597bf8f53

* commit 'd597bf8f536b319c02f82663ecb67e64525b5187':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 02:28:06 +00:00
Lorenzo Colitti
d597bf8f53 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49 
am: 18ec0b5187

* commit '18ec0b518741dc5ac32c52ae9681efec3e73a23c':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 02:19:15 +00:00
Lorenzo Colitti
18ec0b5187 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 
am: 5c09f31e49

* commit '5c09f31e499b662f1fb4982ec8aaa3d293252477':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 01:22:34 +00:00
Jeff Sharkey
008672f62d Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 am: 257d2ca7fd am: e01b99faa5 
am: 6dee8faff3

* commit '6dee8faff3b25c6dd6c8fa308ceb0fb8b31f6a05':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 01:22:32 +00:00
Jeff Sharkey
6dee8faff3 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 am: 257d2ca7fd 
am: e01b99faa5

* commit 'e01b99faa54a083ae7b10db902a03f4aa6c9bd63':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 01:15:29 +00:00
Lorenzo Colitti
5c09f31e49 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev 
am: d214496319

* commit 'd214496319785311f99f8415b7c8be3189420488':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 01:15:27 +00:00
Lorenzo Colitti
d214496319 Merge "Don't buzz when automatically connecting to captive portals" into mnc-dr-dev 2015-10-21 01:10:10 +00:00
Jeff Sharkey
e01b99faa5 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 
am: 257d2ca7fd

* commit '257d2ca7fd75926bd1cfd13d3a07809e2d51a097':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 01:08:55 +00:00
Lorenzo Colitti
46d50b708d Don't buzz when automatically connecting to captive portals 
Play a sound and vibrate (by setting DEFAULT_ALL) only if the
user manually selected the network. This applies to both captive
portals and networks with no Internet access.

Bug: 24126143
Change-Id: Idf075d5c85f9f4b07a3431a25d1a3f7089cf1ee2
 2015-10-21 09:59:31 +09:00
Jeff Sharkey
257d2ca7fd Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 
am: 55d2b6e8e6

* commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 00:55:05 +00:00
Pavel Zhamaitsiak
d3c1c231b6 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2 am: d91b1f6bb8 am: 2c26344cee 
am: 8db6e95afc

* commit '8db6e95afcd70ac389750ab76f4b9f9181fadebb':
  Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
 2015-10-21 00:51:19 +00:00
Jeff Sharkey
55d2b6e8e6 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 2015-10-21 00:48:47 +00:00
Pavel Zhamaitsiak
8db6e95afc Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2 am: d91b1f6bb8 
am: 2c26344cee

* commit '2c26344ceebd0971e6a88b54b5ddafd7130f2607':
  Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
 2015-10-21 00:45:29 +00:00
Pavel Zhamaitsiak
2c26344cee Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2 
am: d91b1f6bb8

* commit 'd91b1f6bb84c22b9b20df2537500bf23f6b65ad2':
  Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
 2015-10-21 00:39:56 +00:00
Rob Carr
d43998e9d7 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 00:33:44 +00:00
Rob Carr
55acb52e59 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 am: a153a8072c 
am: e7413fc53f

* commit 'e7413fc53f47a31fbe998de48ee0e5edd79ed96c':
  Catch exceptions thrown by pending activity launches.
 2015-10-21 00:32:40 +00:00
Pavel Zhamaitsiak
d91b1f6bb8 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev 
am: d99aade6e2

* commit 'd99aade6e2c001cbb8e32c9342f20404bd614443':
  Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
 2015-10-21 00:32:10 +00:00
Jeff Sharkey
bbcb331205 Correctly derive ABI for apps on adopted media. 
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation.  This
change fixes the issue by copying the volume UUID into place early
in the scanning process.

Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.

Bug: 24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
 2015-10-20 17:32:05 -07:00
Rob Carr
379c1c5430 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 am: a153a8072c 
am: e7413fc53f

* commit 'e7413fc53f47a31fbe998de48ee0e5edd79ed96c':
  Catch exceptions thrown by pending activity launches.
 2015-10-21 00:29:53 +00:00
Kevin Cernekee
c32d045c7b Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-21 00:28:27 +00:00
Kevin Cernekee
15acfd19c6 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0 am: d166333eb5 am: a3625076e5 
am: fc5c6090ec  -s ours

* commit 'fc5c6090ec0a8a07d7dbaa4e3b8ed4da9cde233c':
  ignore initial request to disable iptable chain
 2015-10-21 00:27:50 +00:00
Pavel Zhamaitsiak
d99aade6e2 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev 2015-10-21 00:27:27 +00:00
Zach Kuznia
60547db581 Merge "Move stroke buffer and gesture recognition out of TouchExplorer." 2015-10-21 00:26:25 +00:00
Zachary Kuznia
407df712e2 Move stroke buffer and gesture recognition out of TouchExplorer. 
This also adds a return value to the callbacks on
AccessibilityGestureDetector.Listener, so that the listener can indicate if the
event has been consumed, and processing should be halted.

b/25021896

Change-Id: If4d366ff207c1cebd0e3f7dab5f27a2037ddb510
 2015-10-20 17:22:47 -07:00
Chris Craik
5fde3d4363 Merge "Add initial OpReorderer benchmarks" 2015-10-21 00:20:47 +00:00
Chris Craik
0a24b146cd Add initial OpReorderer benchmarks 
Change-Id: I6ca8ea89be2159331b2ad7031769c65f54161918
 2015-10-20 17:19:33 -07:00
Rob Carr
e7413fc53f Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 
am: a153a8072c

* commit 'a153a8072c0a28c36db2489a2ba13b1fc8e179db':
  Catch exceptions thrown by pending activity launches.
 2015-10-21 00:06:43 +00:00
Rob Carr
a153a8072c Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 
am: 894dd2b078

* commit '894dd2b078a5808704f462023c8fcb00b5579ef0':
  Catch exceptions thrown by pending activity launches.
 2015-10-20 23:59:11 +00:00
Matthew Williams
9e7d8c714d Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 am: 4e18ec7343 
am: f012481a44  -s ours

* commit 'f012481a4442cb0289a7d77444c59d7f0041eb18':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 23:56:28 +00:00
Alan Viverette
668895acc4 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 am: ac02be311d am: 41707942a8 
am: e21329ad86  -s ours

* commit 'e21329ad86a7877484fdaa5e6bdc941c2745ad36':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 23:55:04 +00:00
Matthew Williams
cd38651e7d DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc am: cb937cbc6a am: d7d56a4feb 
am: c31529097d  -s ours

* commit 'c31529097de3011cb2145d7bc4b609c2ddc69d41':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
 2015-10-20 23:53:32 +00:00
Elliott Hughes
46a114dfcf Merge "Fix lseek argument order." am: 12dccb8a24 am: 9bbe41642a 
am: 2876b1f169

* commit '2876b1f169e5342e46b27f3f94a8816837c9f61a':
  Fix lseek argument order.
 2015-10-20 23:51:55 +00:00
Rob Carr
894dd2b078 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 
am: 9ada400e98

* commit '9ada400e98451d3ff39ea284be5c205c8c8a3f95':
  Catch exceptions thrown by pending activity launches.
 2015-10-20 23:51:23 +00:00