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

220723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mitchell Wills
e9c56b8f8f Merge "Check if link stats are supported when reporting activity info" 2015-10-24 00:19:58 +00:00
Mitchell Wills
19242993d2 Merge "Add missing ap threshold config for hotlists" 2015-10-24 00:17:11 +00:00
Dan Sandler
170e9d17ec Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 am: 5da8453866 
am: 625c731ccd

* commit '625c731ccd412aaa5d2c8e4a67733e1cc9d1ef38':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:15:55 +00:00
Dan Sandler
7e16b2e8f5 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b 
am: 511357c39b

* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:15:49 +00:00
Dan Sandler
d9a96ff747 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours 
am: ab4857790b

* commit 'ab4857790bc84388817c0bec8c4010d660f35ada':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:15:44 +00:00
Kenny Root
4f08c1781b Merge "Add Workman keyboard layout" am: 9a65c36022 am: b0cc47efe5 
am: 6938fbf3a5

* commit '6938fbf3a5cf8a61d42d8d1778180c3a25114709':
  Add Workman keyboard layout
 2015-10-24 00:04:21 +00:00
Dan Sandler
ab4857790b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e 
am: 6c3186ea07  -s ours

* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:17 +00:00
Dan Sandler
625c731ccd Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 
am: 5da8453866

* commit '5da84538668c03b61ff31ceb679f4f3b12726351':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:16 +00:00
Dan Sandler
511357c39b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours 
am: 410bea181b

* commit '410bea181b229adef7a2c1a9308379eead260706':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 
am: 6026b5b17e

* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 
am: b1de85487a  -s ours

* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:54 +00:00
Dan Sandler
5da8453866 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 
am: 4db8c18755

* commit '4db8c187551bd238b50a85a7be3be6595a69a2ed':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:43 +00:00
Kenny Root
6938fbf3a5 Merge "Add Workman keyboard layout" am: 9a65c36022 
am: b0cc47efe5

* commit 'b0cc47efe5d7c200fe7d527c8c17d0854dfe3d35':
  Add Workman keyboard layout
 2015-10-23 23:49:39 +00:00
Fyodor Kupolov
610acda80a Introduced UserController for multi-user functionality 
The new helper class encapsulates user life-cycle management, provided by
ActivityManagerService.

Bug: 24745840
Change-Id: I8ebfa38febc4090390d1c45a9fc47398e52693ae
 2015-10-23 16:47:09 -07:00
Dan Sandler
6026b5b17e Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 51c2619c77

* commit '51c2619c7706575a171cf29819db14e91b815a62':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:50 +00:00
Dan Sandler
4db8c18755 Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 446dcc9ed7

* commit '446dcc9ed7efa0b80ed7d353478326b2236f2cab':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:39 +00:00
Kenny Root
b0cc47efe5 Merge "Add Workman keyboard layout" 
am: 9a65c36022

* commit '9a65c36022482d7fd4217e537fa434cc79b69f39':
  Add Workman keyboard layout
 2015-10-23 23:39:24 +00:00
Dan Sandler
b1de85487a Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 1044e162c3

* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:22 +00:00
Kenny Root
9a65c36022 Merge "Add Workman keyboard layout" 2015-10-23 23:32:01 +00:00
Ching Tzung Lin
f6e4c9da5f Consolidates config_windowOutsetBottom and circular_display_mask_offset 
Three phases involved:
phase 1: change all code references to circurlar_display_mask_offset to
config_windowOutsetBottom, and mark circular_display_mask_offset
deprecated.

phase 2: remove circular_display_mask_offset from device overlays

phase 3: remove circular_display_mask_offset symbol and default setting.

Bug:25220421
Change-Id: Ia3f77610dbbb964eb58c6b28f6206799d56c44c2
 2015-10-23 15:49:52 -07:00
Winson Chung
e51ba45c82 Merge "Reducing number of threads used in Recents." 2015-10-23 22:13:22 +00:00
Winson
ab84fc5611 Reducing number of threads used in Recents. 
Change-Id: I758592600915d41103a0dfeed10c8630ecdc4593
 2015-10-23 22:11:20 +00:00
Wale Ogunwale
1485acc222 Merge "Updated support for drawing background drawable when resizing" 2015-10-23 21:48:39 +00:00
xin He
9a73eac8f8 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 am: 910e447d96 am: c49f5c83cb 
am: 97170138bc  -s ours

* commit '97170138bc06f39bb87aafae015c26b9727288a8':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error
 2015-10-23 21:22:31 +00:00
Bryce Lee
23915d4011 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-23 21:21:16 +00:00
Bryce Lee
62192ccd4e Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev am: 434a1fd687 am: 998afcb738 
am: 02c51837af

* commit '02c51837af47633703bad00022bcf15b4008f5a4':
  Add config flag for reloading supported profiles in bluetooth on enable.
 2015-10-23 21:20:28 +00:00
Vladislav Kaznacheev
64677dbaf6 Merge "Fix cross-app drag and drop crash." 2015-10-23 21:19:50 +00:00
Vladislav Kaznacheev
68dd2e8644 Fix cross-app drag and drop crash. 
A DragEvent created in DragState.broadcastDragEndedLw
could be recycled twice if one of the notified windows
belongs to the system process. In this case the same
instance of DragEvent is recycled first inside the event
handler, and then the second time before exiting the
function (which causes a RuntimeException).

Added a Pid check similar to another four places in this
class where dispatchDragEvent is called.

Bug: 25079983
Change-Id: Ia7c1b9258a0c624bc7e2451650e2fb362848a16d
 2015-10-23 14:17:56 -07:00
xin He
97170138bc Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 am: 910e447d96 
am: c49f5c83cb

* commit 'c49f5c83cb3cce265836da8ef32009ee7b8f1029':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error
 2015-10-23 21:10:47 +00:00
Bryce Lee
02c51837af Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev am: 434a1fd687 
am: 998afcb738

* commit '998afcb738e148f4f382f5e50df3241ec464d88c':
  Add config flag for reloading supported profiles in bluetooth on enable.
 2015-10-23 21:08:59 +00:00
xin He
c49f5c83cb Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 
am: 910e447d96

* commit '910e447d96732ad22582efb6cea08925dc21e55c':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error
 2015-10-23 20:59:36 +00:00
Bryce Lee
998afcb738 Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev 
am: 434a1fd687

* commit '434a1fd68754e554b331d26d0c684209eaa42fa9':
  Add config flag for reloading supported profiles in bluetooth on enable.
 2015-10-23 20:58:15 +00:00
xin He
910e447d96 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev 
am: 3b47afe765

* commit '3b47afe7656eb16e8ddb04d771a18eab678c125f':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error
 2015-10-23 20:53:48 +00:00
Bryce Lee
434a1fd687 Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev 2015-10-23 20:52:44 +00:00
xin He
3b47afe765 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev 2015-10-23 20:45:24 +00:00
xinhe
2452e54de6 [DO NOT MERGE] EAP-TLS PMKID mismatch error 
b/24253154

Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
 2015-10-23 12:56:25 -07:00
Bryce Lee
c17bbe0be2 Add config flag for reloading supported profiles in bluetooth on enable. 
Bug: 24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc
 2015-10-23 12:32:07 -07:00
Wale Ogunwale
5bcd3189c5 Updated support for drawing background drawable when resizing 
f3a62fbc58bbc7f081a53248cae48a8951294e8f added support for drawing
the background draweable when resizing an activity window.
However, after some additional discussion we decided that
R.styleable.Window_windowResizingBackground and
R.integer.config_windowResizingBackgroundColorARGB are not needed.
We use R.styleable.Window_windowBackground for the background
drawable and fallback to using R.styleable.Window_windowBackgroundFallback
which is now public if the first isn't set.

Bug: 24534744
Change-Id: Ia0507e25a1893ea941d259f1d4e88ce500dda154
 2015-10-23 12:30:28 -07:00
Ching Tzung Lin
7e424b7c57 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba099 am: 9cae56e7b6 
am: d7f0a33bf1

* commit 'd7f0a33bf1cfc9ac78639dd65afb70e1a008a5a8':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
 2015-10-23 18:39:10 +00:00
Adrian Roos
f8ae610e8c Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b am: 5e5f718d23 
am: 989b719e64

* commit '989b719e649266f41353ff5266cabd5b42a297a5':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:37:05 +00:00
Dianne Hackborn
5456721c2a Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 am: 9161871f83 am: 6ff08bd48c 
am: 1d7d1e8282  -s ours

* commit '1d7d1e8282cca0f9a9554e9c31f51eaa1cdb545a':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
 2015-10-23 18:35:44 +00:00
Miao Wang
f5ae4de7ba Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." am: 773756eeed am: 84d6e555f3 
am: b60105d041

* commit 'b60105d041058993708bfb7fa1c86784c3616a51':
  [RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements.
 2015-10-23 18:33:56 +00:00
Ching Tzung Lin
d7f0a33bf1 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba099 
am: 9cae56e7b6

* commit '9cae56e7b6eb38f2f3d53831f5465e85e59f46d5':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
 2015-10-23 18:26:56 +00:00
Adrian Roos
989b719e64 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b 
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:25:02 +00:00
Dianne Hackborn
1d7d1e8282 Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 am: 9161871f83 
am: 6ff08bd48c

* commit '6ff08bd48c3d8c15dcbf1d1591f747d3d56bd071':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
 2015-10-23 18:23:06 +00:00
Ching Tzung Lin
9cae56e7b6 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev 
am: e94b3ba099

* commit 'e94b3ba0994d52eccc7f0ed797ee1b3541f3ae83':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
 2015-10-23 18:13:01 +00:00
Ching Tzung Lin
e94b3ba099 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev 2015-10-23 18:05:52 +00:00
Winson Chung
0511309758 Merge "Cleaning up task loading code." 2015-10-23 18:02:53 +00:00
Winson
e7f138c7f0 Cleaning up task loading code. 
- Moving all references of SystemServicesProxy and RecentsTaskLoader to
  a single static instance in Recents.  This ensures that we only refer
  to an instance that is created with the application context.
- Moving ActivityInfo cache into RecentsTaskLoader with the other caches
  which allows us to invalidate it less frequently.  This requires the
  loader to handle package changes to invalidate the cached infos 
  accordingly.
- Cleaned up old code to handle case where the Recents component for
  secondary users might not be initialized (fixed in ag/773159)
- Moving the package monitor to the background thread.
- Cleaning user interaction and visibility changes to events.
- Fixed issue with sending events from binder thread.

Change-Id: Ie785347055736f6dd7802f32454f77073e20b83e
 2015-10-23 10:55:27 -07:00
Adrian Roos
5e5f718d23 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 
am: a53bbb652b

* commit 'a53bbb652b875e02ce8e5cfd55591adeac033417':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 17:38:17 +00:00