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

220116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrei Stingaceanu
509a74972a Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b 
am: 24fc647e70

* commit '24fc647e70af950dbe671e9a709da8f97b2ba216':
  Fix toolbar flickering in ExtractedMode when longpressing.
 2015-10-21 16:33:28 +00:00
Wale Ogunwale
8d16a3ddea Merge "Ensure state transition of paused activity." am: c2b9c5388a 
am: 11695e8081

* commit '11695e8081b269d489b5b4cc0b0c2075baeebc9b':
  Ensure state transition of paused activity.
 2015-10-21 16:33:25 +00: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
Geoff Mendal
d2e6907eae Merge "Import translations. DO NOT MERGE" 2015-10-21 16:18:14 +00:00
Geoff Mendal
fedec45da8 Import translations. DO NOT MERGE 
Change-Id: I59c124cc18282b0fd4b227054bc550ee968689f9
Auto-generated-cl: translation import
 2015-10-21 11:16:57 -05:00
Wale Ogunwale
11695e8081 Merge "Ensure state transition of paused activity." 
am: c2b9c5388a

* commit 'c2b9c5388a4038ba260e2c36b7b8884cf4097c2e':
  Ensure state transition of paused activity.
 2015-10-21 16:08:51 +00: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
Wale Ogunwale
c2b9c5388a Merge "Ensure state transition of paused activity." 2015-10-21 16:03:23 +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
Jason Monk
78c5faff99 Merge "Some updates to QS prototype based on new mocks" 2015-10-21 15:44:26 +00:00
Jason Monk
94a1bf6a18 Some updates to QS prototype based on new mocks 
Change-Id: Ic9c0cfcb77f558fa82edb4dc39406ce95b031b35
 2015-10-21 08:40:22 -07:00
Ben Kwa
55b720c4d1 Merge "Implement enter key support for DocumentsUI." 2015-10-21 15:16:28 +00:00
Geoff Mendal
ae64417b56 Import translations. DO NOT MERGE am: 0705d75d69 -s ours am: c1fe7bdce5 -s ours 
am: da0905f120  -s ours

* commit 'da0905f120701956b8ab03d34eff615fcdebea1f':
  Import translations. DO NOT MERGE
 2015-10-21 15:07:53 +00:00
Paul Lawrence
2a75ecbe9d Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-10-21 15:04:17 +00:00
Paul Lawrence
146ef50d5b 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:03:54 +00:00
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