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

201911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
be8fe13d12 Import translations. DO NOT MERGE 
Change-Id: Ie4b7d4378ff46c26fa5da8449fca10274beef157
Auto-generated-cl: translation import
 2015-10-21 10:03:57 -07:00
Geoff Mendal
5bb1fa58d7 Import translations. DO NOT MERGE 
Change-Id: I6766fce7213a69ce3e08ce5de869714b89e62adf
Auto-generated-cl: translation import
 2015-10-21 10:00:28 -07:00
Geoff Mendal
a400a1236c Import translations. DO NOT MERGE 
Change-Id: If77b4f540cb80ac3d88c56d043069c4fd890b81a
Auto-generated-cl: translation import
 2015-10-21 09:56:57 -07:00
Geoff Mendal
a73a642bfe Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:51:34 +00:00
Geoff Mendal
b4dc6a35d3 Import translations. DO NOT MERGE 
Change-Id: Ie451c3262cd6073b9cbf71ab8d0bc38ad212b0c4
Auto-generated-cl: translation import
 2015-10-21 09:48:43 -07:00
Geoff Mendal
84ab40cab2 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 16:47:40 +00:00
Geoff Mendal
762ce0fc44 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 8ba1cdd946  -s ours

* commit '8ba1cdd9464b88375755e1976e4ee0f5620ff5be':
  Import translations. DO NOT MERGE
 2015-10-21 16:47:13 +00:00
Geoff Mendal
88f7134584 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:45:48 +00:00
Geoff Mendal
7e1d841d63 Import translations. DO NOT MERGE 
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
 2015-10-21 09:45:23 -07:00
Geoff Mendal
7f174ff665 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:33 +00:00
Geoff Mendal
55bc169d50 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:08 +00:00
Geoff Mendal
721249f22b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:43:45 +00:00
Geoff Mendal
04733e23a3 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:43:21 +00:00
Geoff Mendal
cd000a2228 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:42:29 +00:00
Geoff Mendal
8caa78eccb Import translations. DO NOT MERGE 
Change-Id: I9ee163f9a6b6bc4150c8661f3087385b5415dd0b
Auto-generated-cl: translation import
 2015-10-21 09:42:17 -07:00
Geoff Mendal
b8f70e10ef Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:42:08 +00:00
Geoff Mendal
8ba1cdd946 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-21 16:39:56 +00:00
Geoff Mendal
5fafafc434 Import translations. DO NOT MERGE 
Change-Id: I74489702454570e28841759451b47d7381dcf8c7
Auto-generated-cl: translation import
 2015-10-21 09:39:05 -07:00
Geoff Mendal
1e7fb19408 Import translations. DO NOT MERGE 
Change-Id: Ie94144993d7f959cf30eaeba12ef9a86a92bb48d
Auto-generated-cl: translation import
 2015-10-21 11:37:21 -05:00
Geoff Mendal
91898cca7d Import translations. DO NOT MERGE 
Change-Id: I2dfb95a393fe97360dc2fff6f849c727cb6a180b
Auto-generated-cl: translation import
 2015-10-21 09:35:36 -07:00
Geoff Mendal
65855a104b Import translations. DO NOT MERGE 
Change-Id: Iaef98e762ece5d69ed668ca83daecc0273197bf4
Auto-generated-cl: translation import
 2015-10-21 09:32:22 -07:00
Geoff Mendal
efb0f8d77f Import translations. DO NOT MERGE 
Change-Id: Id94c0578c377d92e038affd93bf25a07b22e9d7d
Auto-generated-cl: translation import
 2015-10-21 09:29:09 -07:00
Geoff Mendal
990df68b2a Import translations. DO NOT MERGE 
Change-Id: Iafe3e615aa33308b7fb6e2b71df40e190371b7f3
Auto-generated-cl: translation import
 2015-10-21 11:24:14 -05:00
Andrei Stingaceanu
24fc647e70 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev 
am: ee4ab0a55b

* commit 'ee4ab0a55b355b21168de0eb5615f2e321c2982f':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 16:03:52 +00:00
Andrei Stingaceanu
ee4ab0a55b Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev 2015-10-21 15:56:26 +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
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
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
0705d75d69 Import translations. DO NOT MERGE 
Change-Id: Idaba78408b31b9161ac35fbcf940266b491ee296
Auto-generated-cl: translation import
 2015-10-21 05:14:07 -07: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
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
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
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
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
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
Rob Carr
9ada400e98 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 2015-10-20 23:30:12 +00:00
Pavel Zhamaitsiak
b4faf348f1 Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag 
Bug: 23731243
Change-Id: I3e08469ef293f0b619f95dd9fb48e8c582926270
 2015-10-20 23:28:12 +00:00
Selim Cinek
2ae7107d0e Changing the ordering for heads up notifications 
In the new ranking, notifications with fullscreen
intents always take priority over those without,
such that when you get a call and a message
in succession, you would always see the
call on top and are able to pick it up.

Bug: 22778349
Change-Id: Ia9aaf009998fc9493f513dc71f2649d38ccf7a79
 2015-10-20 23:17:59 +00:00
Kevin Cernekee
d166333eb5 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 
am: 3554d62ca0

* commit '3554d62ca02bf6bc7777d1b22699876ec388fe6c':
  ignore initial request to disable iptable chain
 2015-10-20 22:18:22 +00:00
Matthew Williams
07de80bd87 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 
am: cf43b5523f

* commit 'cf43b5523fd12fdc69ea25cb6dbf5e95724927ec':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:15:36 +00:00
Kevin Cernekee
3554d62ca0 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 2015-10-20 22:11:29 +00:00
Matthew Williams
cf43b5523f Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 2015-10-20 22:03:17 +00:00
Alan Viverette
ac02be311d Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 
am: 4823493647

* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 21:56:40 +00:00