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

209939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
2146fc54db Import translations. DO NOT MERGE 
Change-Id: I007a3a78896d57bce209c863418a24019d743d53
Auto-generated-cl: translation import
 2015-07-31 19:36:08 -07:00
Selim Gurun
b225d05ce4 Merge "Update onPause documentation" 2015-07-31 23:07:11 +00:00
Abodunrinwa Toki
1d91ea4eb3 Merge "Enable PhoneWindowActionModeTest in continuous testing." 2015-07-31 22:52:45 +00:00
Abodunrinwa Toki
fc828febf7 Enable PhoneWindowActionModeTest in continuous testing. 
Instrumentation tests running in continuous testing should be
annotated with one of @SmallTest, @MediumTest, @LargeTest.

Change-Id: Ib9c450287b170683f40cfce3ba8d049023ddc357
 2015-07-31 15:20:06 -07:00
Steve McKay
f72847b412 Merge "Start selection mode with single mouse click..." 2015-07-31 21:27:24 +00:00
Selim Gurun
922cb58b65 Update onPause documentation 
onPause() method documentation wrongly claims it stops JS. This could
have been true for very early implementations of Webview which does
not use V8 (pre-honeycomb) however it is not the case anymore
since V8 does not provide a way to stop JS safely for a particular Webview.

Change-Id: I6363dc2ef47c463da6baa417832da750225f5cf2
 2015-07-31 14:02:57 -07:00
Steve McKay
5353a1eb7d Start selection mode with single mouse click... 
Double clicking an item opens it.
BandSelectManager tells MultiSelectManager where its selection begins
    so Shift+Click behavior can be complimentary.
BandSelectManager more actively manages selection...so it doesn't
    clear existing selection on mouse down.

Change-Id: Ibe65e793e84463d333a19f363dfb0d42c37480e3
 2015-07-31 11:38:44 -07:00
Tyler Gunn
4e38bc2384 am bd19c1bd: am 4cfe2a8c: am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit 'bd19c1bd9288c9feeec7df34ea4c2f1ee4d85cf5':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:33:08 +00:00
Tyler Gunn
bd19c1bd92 am 4cfe2a8c: am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit '4cfe2a8c0050a69e1793f41a60395b69277973b2':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:22:33 +00:00
Tyler Gunn
4cfe2a8c00 am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit 'f26ec92d9632868d37ea7aca9ad4a2474ae0a052':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:11:07 +00:00
Tyler Gunn
f26ec92d96 am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit 'a21b2e30b246b152b3b3692384de534ade2f3485':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:01:57 +00:00
Tyler Gunn
a21b2e30b2 resolved conflicts for merge of d0694da4 to mnc-dr-dev 
Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a
 2015-07-31 09:02:32 -07:00
Tyler Gunn
d0694da4fb Merge "Add telecom extra keys required for DMR release." into mnc-dev 2015-07-31 15:42:48 +00:00
Julia Reynolds
905d51a2f8 am 2a23ef28: am 8ceb1188: am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '2a23ef2817bc424c7b1f353394c4653463bd7522':
  Fix SysUI crash on device boot.
 2015-07-31 14:22:50 +00:00
Julia Reynolds
2a23ef2817 am 8ceb1188: am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '8ceb1188f17826088695ed488ad0ab58ec22afa2':
  Fix SysUI crash on device boot.
 2015-07-31 14:16:04 +00:00
Julia Reynolds
8ceb1188f1 am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit 'e787bfa209a4fa6fc2f4cd754492a13472952c5c':
  Fix SysUI crash on device boot.
 2015-07-31 14:09:06 +00:00
Julia Reynolds
e787bfa209 am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '9bc9469807703757f50fffd34ed6b3f6183cdc6e':
  Fix SysUI crash on device boot.
 2015-07-31 14:02:01 +00:00
Julia Reynolds
9bc9469807 am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
  Fix SysUI crash on device boot.
 2015-07-31 13:57:02 +00:00
Julia Reynolds
5d6a2d387c Merge "Fix SysUI crash on device boot." into mnc-dev 2015-07-31 13:49:26 +00:00
Rubin Xu
fe04d76ed9 am 0550536b: am 3eaf7d21: am 6501720c: am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '0550536b27176170a8ef3f8ed8f7e955b8d2a663':
  Don't always transfer device owner status to other users.
 2015-07-31 13:40:15 +00:00
Rubin Xu
0550536b27 am 3eaf7d21: am 6501720c: am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '3eaf7d2155d0c513eb08f66abc02f87b09659be7':
  Don't always transfer device owner status to other users.
 2015-07-31 13:33:39 +00:00
Rubin Xu
3eaf7d2155 am 6501720c: am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '6501720c721f2a0997d7cdd45303ed14eb54ded7':
  Don't always transfer device owner status to other users.
 2015-07-31 13:28:42 +00:00
Rubin Xu
6501720c72 am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '489043d49be1ea66b7714666193e69399cffa223':
  Don't always transfer device owner status to other users.
 2015-07-31 13:21:31 +00:00
Julia Reynolds
8478aba1a2 Fix SysUI crash on device boot. 
Bug: 22869066
Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd
 2015-07-31 09:17:20 -04:00
Rubin Xu
489043d49b am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '9a81a182df634ab7a087752c9a10db67c5d0f256':
  Don't always transfer device owner status to other users.
 2015-07-31 13:15:44 +00:00
Rubin Xu
9a81a182df Merge "Don't always transfer device owner status to other users." into mnc-dev 2015-07-31 13:11:08 +00:00
Benjamin Franz
98a70b9d35 am 33cb97c0: am 54aed521: am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '33cb97c0f0824f8a5f35c09db28565b076bc9994':
  Add missing return statement
 2015-07-31 10:08:20 +00:00
Benjamin Franz
33cb97c0f0 am 54aed521: am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '54aed5215d8542e7425c107e1bcdfea2dfa0fff8':
  Add missing return statement
 2015-07-31 10:01:34 +00:00
Benjamin Franz
54aed5215d am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '93d45d1c22d277abd182e01a7afee93b5015dbd6':
  Add missing return statement
 2015-07-31 09:56:13 +00:00
Benjamin Franz
93d45d1c22 am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '982daf8769bf78dd6bb240dab9ac7d0a62de21cc':
  Add missing return statement
 2015-07-31 09:47:55 +00:00
Benjamin Franz
982daf8769 am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit 'd692fcf115e57fef8a15c214fb2fcde78a48b45c':
  Add missing return statement
 2015-07-31 09:42:43 +00:00
Nicolas Prevot
e2a4a6ff8a Don't always transfer device owner status to other users. 
A device owner cannot use device or profile owner policies on
other users unless it is profile owner there. Also limit device
initializer to system apps only.

Bug: 21800830
Change-Id: Ie1abbd891945b91b17ecdf7f73ba93aaa19819be
 2015-07-31 09:32:15 +01:00
Benjamin Franz
d692fcf115 Merge "Add missing return statement" into mnc-dev 2015-07-31 08:22:53 +00:00
Lorenzo Colitti
00c8a9d60a am 5bbbf8ed: am 3b03916d: am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '5bbbf8edfd74389f9b38d3497d6d86afb543b8f2':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:49:08 +00:00
Lorenzo Colitti
5bbbf8edfd am 3b03916d: am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '3b03916de7d1d2c91d5d8c9d1f0f555814a9242f':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:43:26 +00:00
Geoff Mendal
2436caebad Merge "Import translations. DO NOT MERGE" 2015-07-31 05:39:47 +00:00
Lorenzo Colitti
3b03916de7 am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit 'c7a86e90ea5f61e9135e2f9acae0c5c3f37522fc':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:37:15 +00:00
Lorenzo Colitti
c7a86e90ea am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit 'c70348c194a26176ac54720fe4eabeeb7e4d9993':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:31:04 +00:00
Lorenzo Colitti
c70348c194 am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '496a9d269b0778ffa1965f3b11d768fe70fd7719':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:24:49 +00:00
Lorenzo Colitti
496a9d269b Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 2015-07-31 05:17:08 +00:00
Yasuhiro Matsuda
eff7f5f576 Merge "Fix a compile error with DEBUG_SERVICE enabled." 2015-07-31 04:30:22 +00:00
Yasuhiro Matsuda
8b5cd9fda4 Fix a compile error with DEBUG_SERVICE enabled. 
Fixes the following compile error that occurs when
DEBUG_SERVICE is set to true.

frameworks/base/services/core/java/com/android/server/am/\
ActiveServices.java:1624: error: variable si might not \
have been initialized
                        + si.intent);

Change-Id: I62851d9d9de18294b555834e042025eeca0ad5ae
 2015-07-31 13:24:42 +09:00
Geoff Mendal
8ec3a77900 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22826906
Change-Id: I08b9267744b207c30d99597d70ddaeab4de9f8f8
 2015-07-30 21:17:18 -07:00
Dave Langemak
1b748f77d3 am 66cff122: am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev 
* commit '66cff122cc6d123b947be5f28186dc233a7be1aa':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
 2015-07-31 03:23:50 +00:00
Hung-ying Tyan
e98ba7e175 am 058fbd0f: am 4581ca53: am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev 
* commit '058fbd0fef35e62d2baf3e58b7a0c2f24b155dff':
  Revise lockdown check in getLegacyVpnInfo()
 2015-07-31 03:23:43 +00:00
Dave Langemak
66cff122cc am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev 
* commit '2e802cac1dc036e62d6744d07d0cad56eb37052a':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
 2015-07-31 03:18:01 +00:00
Hung-ying Tyan
058fbd0fef am 4581ca53: am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev 
* commit '4581ca5308fde9e7a0aafc7bda6fe3cd878efc22':
  Revise lockdown check in getLegacyVpnInfo()
 2015-07-31 03:17:55 +00:00
Dave Langemak
2e802cac1d am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev 
* commit '72dcb47d945a5a9e35059c01cd8a1593e6740a42':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
 2015-07-31 03:10:40 +00:00
Hung-ying Tyan
4581ca5308 am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev 
* commit '7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1':
  Revise lockdown check in getLegacyVpnInfo()
 2015-07-31 03:10:33 +00:00
Geoff Mendal
2722960cbf am 8e717629: (-s ours) am 9bd5d8a6: (-s ours) am 50265fc2: (-s ours) am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '8e717629958b0f18833fc0de07edca181a14419b':
  Import translations. DO NOT MERGE
 2015-07-31 03:07:53 +00:00