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

212505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mitchell Wills
658b8c258c am a578ac88: am 9fde6f2c: am edf93764: am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 
* commit 'a578ac888622a6b46bbaac78b04adebec9b9979b':
  Remove wifi enabled checking from settings TetherUtil
 2015-08-20 18:58:56 +00:00
Sharvil Nanavati
e71a708d8f am 3514e70c: (-s ours) am f8d6f72d: am 69504b53: Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev 
* commit '3514e70c7fbcd9a393ffd1b4dfe16d552674eeaa':
  DO NOT MERGE Work around for not getting APN info in NetworkInfo object.
 2015-08-20 18:58:50 +00:00
Mitchell Wills
a578ac8886 am 9fde6f2c: am edf93764: am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 
* commit '9fde6f2c662b63164a2930852b9e09805bdbdc24':
  Remove wifi enabled checking from settings TetherUtil
 2015-08-20 18:51:58 +00:00
Sharvil Nanavati
3514e70c7f am f8d6f72d: am 69504b53: Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev 
* commit 'f8d6f72d5d8ceb267f8c9100cefc71e350217bd1':
  DO NOT MERGE Work around for not getting APN info in NetworkInfo object.
 2015-08-20 18:51:52 +00:00
Mitchell Wills
9fde6f2c66 am edf93764: am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 
* commit 'edf93764f09357f6062eee2e4da8da925247834a':
  Remove wifi enabled checking from settings TetherUtil
 2015-08-20 18:45:11 +00:00
Sharvil Nanavati
f8d6f72d5d am 69504b53: Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev 
* commit '69504b53553589bf272c2185e709a5cd57cb452c':
  DO NOT MERGE Work around for not getting APN info in NetworkInfo object.
 2015-08-20 18:45:01 +00:00
Derek Sollenberger
1ad545d207 Fix path direction enum to match native SkPath values 
Change-Id: I4010e400cef0baf6dd23d7f7e837a2bfb7154059
 2015-08-20 14:27:10 -04:00
Mitchell Wills
edf93764f0 am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 
* commit 'b460cc88865bbdafe3f343e43bd08382c6745fe0':
  Remove wifi enabled checking from settings TetherUtil
 2015-08-20 17:28:01 +00:00
Doris Liu
e4a6f92562 Merge "Add tests for ValueAnimator" 2015-08-20 17:19:50 +00:00
Xiaohui Chen
225c8387eb Merge changes I260758f1,Ib6c2ed11 
* changes:
  Clean up USER_OWNER reference in PMS
  Clean up USER_OWNER in notifications
 2015-08-20 17:03:53 +00:00
Mitchell Wills
b460cc8886 Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 2015-08-20 16:58:02 +00:00
Sharvil Nanavati
69504b5355 Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev 2015-08-20 16:45:52 +00:00
Sharvil Nanavati
2aa0523f79 DO NOT MERGE Work around for not getting APN info in NetworkInfo object. 
This change is a workaround to an issue where the APN name is missing
in the CONNECTIVITY_ACTION intent. Submitting this patch so we can
unblock AVL testing.

Bug: 22908453
Change-Id: I67f67872b8636e63404bd6c2cf7835feb586f254
 2015-08-20 09:38:30 -07:00
Steve McKay
8c88c6cdd1 Merge "Move Drawer management code to a facade." 2015-08-20 16:19:38 +00:00
Jason Monk
31d4cad5ae Merge "SysUI Tuner: Add clock seconds option" 2015-08-20 15:42:15 +00:00
Filip Gruszczynski
8dc911aef4 Merge "Non colliding positioning of entering resizeable tasks." 2015-08-20 15:34:28 +00:00
Ben Wagner
b03198de9f Merge "Use static_assert instead of SK_COMPILE_ASSERT." 2015-08-20 14:56:10 +00:00
Nicolas Prévot
be8b98b939 Merge "Allow non-owner users to have managed profiles." 2015-08-20 14:48:18 +00:00
Clara Bayarri
3014e63f08 Merge "Hook up Ctrl + '/' to SysUI for a Keyboard Shortcuts screen" 2015-08-20 14:19:05 +00:00
Clara Bayarri
f2debb1f9a Hook up Ctrl + '/' to SysUI for a Keyboard Shortcuts screen 
This CL adds the necessary hooks between PhoneWindowManager
and SysUI to show a keyboard shortcuts screen given a specific
shortcut combination. SysUI for now just shows a Toast.

Change-Id: Icf43a81776b04a2e96a540f45b7cd3464342d679
 2015-08-20 15:11:10 +01:00
Nicolas Prevot
b818681dca Allow non-owner users to have managed profiles. 
In the split system user model:
The only users that are not allowed to have managed profiles are:
- purely system user (user 0)
- guest users
- restricted profiles
- managed profiles

In the non-split system user model, the behavior does not change:
only the primary user can have managed profiles.

BUG:22956426
Change-Id: If908c30f110fd3e740770174f050c9b6cf87ce1b
 2015-08-20 14:15:19 +01:00
Nicolas Prevot
741abfc120 Fix cross-profile intent filters with system-user split. 
Don't assume that the parent is always the user owner.

BUG:23105562
Change-Id: Ia98ed608e2b6d1d82d95a73110134d85274c6abf
 2015-08-20 12:14:37 +00:00
Nicolas Prevot
2af03d2a7a Send the MANAGE_PROFILE_ADDED broadcast to the correct user. 
Send it to the parent, who is not always the user owner.

BUG:22753960
Change-Id: Ibd0edb78be4b3bdfc9fc31fd05e50fe3bf8bb493
 2015-08-20 11:32:10 +00:00
Florian Salbrechter
30c3c09071 Merge "Fix wrong javadoc in BluetoothAdapter." 2015-08-20 09:29:29 +00:00
Jorim Jaggi
f13a24fa46 am b7421d54: am e30df6fc: am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 
* commit 'b7421d5438f014f501691076cf86ac654798e6bf':
  Save interactive/screen-on state in KeyguardServiceDelegate
 2015-08-20 02:45:56 +00:00
Jorim Jaggi
0eb6586bef am a0d57270: am e46b5b48: am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* commit 'a0d5727078bdb47f19613b9c73e5d973281609f5':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:45:49 +00:00
Jorim Jaggi
b7421d5438 am e30df6fc: am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 
* commit 'e30df6fcedfd5ccaa35315ea79b17aab4677fb1e':
  Save interactive/screen-on state in KeyguardServiceDelegate
 2015-08-20 02:38:56 +00:00
Jorim Jaggi
a0d5727078 am e46b5b48: am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* commit 'e46b5b48235af0aebfc0afa86ea899204463ef8a':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:38:49 +00:00
Dianne Hackborn
afa9b6fd39 am 8755f9eb: am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit '8755f9ebb820007d8e568f2e664519ac8e4bc7d7':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:33:35 +00:00
Jorim Jaggi
e30df6fced am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 
* commit '7de9fbca0bf968aa4dfa48be042bb45f77fed081':
  Save interactive/screen-on state in KeyguardServiceDelegate
 2015-08-20 02:29:15 +00:00
Jorim Jaggi
e46b5b4823 am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* commit 'a2737beea11455c48b719c6d2f26d5908d4b8cd2':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:29:09 +00:00
Dianne Hackborn
8755f9ebb8 am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit '60931a784ff5c7659a432ed7b4f5ea5a22156637':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:26:28 +00:00
Bart Sears
3b1c32eb5d Merge "Revert "Simplify TextureView draw path"" 2015-08-20 02:25:30 +00:00
Jorim Jaggi
7de9fbca0b am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 
* commit '2364af2083f4f0b00ae8275aed1aeb4193f4b89d':
  Save interactive/screen-on state in KeyguardServiceDelegate
 2015-08-20 02:25:02 +00:00
Jorim Jaggi
a2737beea1 am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* commit '1fa7384a101450c4619ed43e176d5a54aa0a54f3':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:24:56 +00:00
Bart Sears
d35dcb1311 Revert "Simplify TextureView draw path" 
This reverts commit 20a248934c67b19c8734362dba76a5cc94254686.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
 2015-08-20 02:23:39 +00:00
Jorim Jaggi
2364af2083 Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 2015-08-20 02:18:36 +00:00
Jorim Jaggi
1fa7384a10 Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* changes:
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:18:20 +00:00
Dianne Hackborn
60931a784f am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit 'dc4442f1a698017dc5c700969392497cbc934126':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:17:26 +00:00
Dianne Hackborn
dc4442f1a6 am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit '2af6ec5198ed6edf7576c19a358afddcc4068ff7':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:12:22 +00:00
Dianne Hackborn
2af6ec5198 am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit 'c14cbac4a3e76d924621b34367cc8b6bcf977908':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:03:31 +00:00
Jeff Sharkey
36d4aaeb6e am 39c49625: am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit '39c4962580a52d5ca07f3576009564dddc8f4624':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:59:19 +00:00
Jorim Jaggi
662b33fcff am 6b0f0dd6: am 66d7cdcd: am df5ca90e: am 37c11800: Don\'t animate in the navigation bar when going to full shade 
* commit '6b0f0dd60b7987085543abca519108a057af552d':
  Don't animate in the navigation bar when going to full shade
 2015-08-20 01:59:12 +00:00
David Friedman
40151bf5ad am abe90d96: am 7be017cb: am 3871224e: am 28f1794f: am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 
* commit 'abe90d9613446f5a44a6072b17e8912d347b49da':
  Docs: Creating interactive watch faces Bug: 21721463
 2015-08-20 01:59:05 +00:00
Jeff Sharkey
39c4962580 am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'e6983e877888dd51abe090b75fa568a64e9fc16e':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:57:52 +00:00
Jorim Jaggi
6b0f0dd60b am 66d7cdcd: am df5ca90e: am 37c11800: Don\'t animate in the navigation bar when going to full shade 
* commit '66d7cdcd6e1fcb0732bdaa536de580ddfb4d157b':
  Don't animate in the navigation bar when going to full shade
 2015-08-20 01:57:46 +00:00
Dianne Hackborn
c14cbac4a3 Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 2015-08-20 01:56:02 +00:00
Dianne Hackborn
cf836079cd Fix issue #23361510: Increase assist timeout from 500ms to 1 second 
Actually, timeout is okay, but need to schedule it on UI thread.

Change-Id: I5b4ffa7caa33815a5223e3ddd08d4809bc7cf7b6
 2015-08-19 18:54:38 -07:00
David Friedman
abe90d9613 am 7be017cb: am 3871224e: am 28f1794f: am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 
* commit '7be017cb9283f605cca18c499448e5a7ca06eb76':
  Docs: Creating interactive watch faces Bug: 21721463
 2015-08-20 01:53:24 +00:00
Jeff Sharkey
e6983e8778 am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'cd6ba4120c346842f82e8c4a710e9c4e26db3b67':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:49:40 +00:00