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

309611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Gaillard
013edba605 Update layoutlib following Change Ia12d448a 
Test: layoutlib tests
Change-Id: I66632bcef3a05d3d89e7fc6a37f099100feed0ad
 2017-03-07 12:34:37 +00:00
Rubin Xu
c068aa2209 Merge "Allow user with a profile owner to have escrow tokens" 2017-03-07 10:59:53 +00:00
Erik Kline
a1d0c089d2 Merge "Handle null NetworkState updates" am: ae758b2c7f am: 4cf8f7a8cd 
am: b48eb4f71a

Change-Id: Idd5cf1b8de35cca3a7518d6ed76d87044c8846b4
 2017-03-07 06:40:24 +00:00
Erik Kline
b48eb4f71a Merge "Handle null NetworkState updates" am: ae758b2c7f 
am: 4cf8f7a8cd

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
 2017-03-07 06:36:13 +00:00
Erik Kline
4cf8f7a8cd Merge "Handle null NetworkState updates" 
am: ae758b2c7f

Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
 2017-03-07 06:31:48 +00:00
Treehugger Robot
ae758b2c7f Merge "Handle null NetworkState updates" 2017-03-07 06:24:17 +00:00
Erik Kline
6bbefcbf40 Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9 am: e0a62a4398 
am: 3765538bab

Change-Id: Ic82e3cb92841ea99972faad6ae004d77c725831b
 2017-03-07 06:08:40 +00:00
Erik Kline
3765538bab Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9 
am: e0a62a4398

Change-Id: Ie9bd779526e967790cbc51de52a64bbf7cd493a5
 2017-03-07 06:04:13 +00:00
Erik Kline
e0a62a4398 Merge "Always send all available state when calling onAvailable()." 
am: affbb8b6a9

Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
 2017-03-07 06:00:09 +00:00
Treehugger Robot
affbb8b6a9 Merge "Always send all available state when calling onAvailable()." 2017-03-07 05:51:41 +00:00
TreeHugger Robot
7cae77b606 Merge changes Iefcaf262,I9c397d83 
* changes:
  Fixed a bug where the expand icon could show but nothing happens
  Improved expand accessibility experience
 2017-03-07 05:44:54 +00:00
TreeHugger Robot
25e98e3c92 Merge "Waiting for reinflating the notifications until the user switched" 2017-03-07 05:24:11 +00:00
Winson Chung
192b50d518 Merge "Small fixes and tweaks to PiP transition." 2017-03-07 05:02:17 +00:00
Winson Chung
f4284638c4 Merge "Update how PIP size is determined" 2017-03-07 05:01:23 +00:00
Winson Chung
6c83d23088 Merge "Initial changes to support expanded PiP" 2017-03-07 05:00:59 +00:00
TreeHugger Robot
4540811b4d Merge "AOD: Refactor always on configuration" 2017-03-07 04:40:30 +00:00
Erik Kline
34baa3da4e Handle null NetworkState updates 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering to WiFi and mobile switching works
Bug: 32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
 2017-03-07 13:17:53 +09:00
TreeHugger Robot
8cfea13985 Merge "Move requestKeyboardShortcuts intent to com.android" 2017-03-07 03:59:47 +00:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable(). 
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
 2017-03-07 12:57:26 +09:00
Tyler Gunn
356322fb1e Merge "API review cleanups/changes." am: 9324d6513b am: dd4bc7c69c 
am: c49b011151

Change-Id: Ib3d76474bef8c911b2ec6a61b916e38af0a3b861
 2017-03-07 03:05:23 +00:00
Ruchi Kandoi
c2cf8e0b0c Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am: 7b0d16249c am: 9377a53aa9 
am: 61d2a43fa9

Change-Id: Ibb35611f958bf9d1525e0b491860cbc87f1e1273
 2017-03-07 02:59:38 +00:00
Tyler Gunn
c49b011151 Merge "API review cleanups/changes." am: 9324d6513b 
am: dd4bc7c69c

Change-Id: I40b7b0f025de54e6f92764949ba3d06370d45cd6
 2017-03-07 02:57:41 +00:00
Erik Kline
108a492d7f Merge "Start of tethering OffloadController" am: 121006f428 am: 4568fa4a82 
am: afc5f223e9

Change-Id: Ia918bd348462aefaf0474dfe9a66ec9fa7ef76b8
 2017-03-07 02:57:10 +00:00
Ruchi Kandoi
61d2a43fa9 Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am: 7b0d16249c 
am: 9377a53aa9

Change-Id: Ib8196c580da8fc8602e2a88945050b84545576e8
 2017-03-07 02:53:09 +00:00
Erik Kline
afc5f223e9 Merge "Start of tethering OffloadController" am: 121006f428 
am: 4568fa4a82

Change-Id: Ib1a7b2cad37e85335d498a12d36f0209b33d5c26
 2017-03-07 02:52:09 +00:00
Tyler Gunn
dd4bc7c69c Merge "API review cleanups/changes." 
am: 9324d6513b

Change-Id: Iaeb4bbb5e551bf4206ea2ab4372d1ba0533c4709
 2017-03-07 02:49:54 +00:00
Ruchi Kandoi
9377a53aa9 Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" 
am: 7b0d16249c

Change-Id: I35ccc367fc1182c1cf8c470d8bfcf6dcf27d2825
 2017-03-07 02:46:54 +00:00
Erik Kline
4568fa4a82 Merge "Start of tethering OffloadController" 
am: 121006f428

Change-Id: I590569818c7d7ac50dcc61bd7058bd7c5cad4e77
 2017-03-07 02:45:51 +00:00
TreeHugger Robot
718c59bbbb Merge "Init of OverlayManagerService on a parallel thread" 2017-03-07 02:03:41 +00:00
TreeHugger Robot
8729c7e2b7 Merge "Fixed a crash when creating a public notification group" 2017-03-07 02:01:07 +00:00
TreeHugger Robot
4f501c1280 Merge "Add logging constants for pref change tracking in Settings." 2017-03-07 02:00:31 +00:00
Tyler Gunn
9324d6513b Merge "API review cleanups/changes." 2017-03-07 01:55:59 +00:00
TreeHugger Robot
7b0a72236c Merge "Prevent creation of default channel." 2017-03-07 01:54:14 +00:00
TreeHugger Robot
7f792f4be1 Merge "Customizable minimum suffix/prefix length for hyphenation" 2017-03-07 01:46:03 +00:00
Treehugger Robot
7b0d16249c Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" 2017-03-07 01:27:18 +00:00
Saige McVea
902adc6cde Merge "Accessibility settings refresh." 2017-03-07 01:16:50 +00:00
Treehugger Robot
121006f428 Merge "Start of tethering OffloadController" 2017-03-07 01:00:57 +00:00
Android Build Merger (Role)
280a9cfaab Merge "Merge "BluetoothManagerService: continue teardown when BLE apps registered" am: ba0992f4c4 am: 9b3d4cb3a7 am: 6af673dd01" 2017-03-07 00:47:21 +00:00
Andre Eisenbach
e8e8058d70 Merge "BluetoothManagerService: continue teardown when BLE apps registered" am: ba0992f4c4 am: 9b3d4cb3a7 
am: 6af673dd01

Change-Id: Id01c3121207b0bdd07bfd4c8a0ebd179a2737ade
 2017-03-07 00:46:44 +00:00
Android Build Merger (Role)
2bfd8ba9d5 Merge "Merge "Removed close guards for Element and Type objects" am: 97c9b57cec am: 25684ceff5 am: 04d8f0c843" 2017-03-07 00:46:18 +00:00
Hall Liu
42eb1ac202 Merge "Add further Connection-side APIs for RTT (part 2)" 2017-03-07 00:46:09 +00:00
Yang Ni
0157e87cfc Merge "Removed close guards for Element and Type objects" am: 97c9b57cec am: 25684ceff5 
am: 04d8f0c843

Change-Id: I036507ba5241fcd0e5ce6f7bb3599cb0720b0cfb
 2017-03-07 00:45:31 +00:00
Andre Eisenbach
6af673dd01 Merge "BluetoothManagerService: continue teardown when BLE apps registered" am: ba0992f4c4 
am: 9b3d4cb3a7

Change-Id: I4274d7908d09401496782005b560634376d820cf
 2017-03-07 00:41:56 +00:00
Yang Ni
04d8f0c843 Merge "Removed close guards for Element and Type objects" am: 97c9b57cec 
am: 25684ceff5

Change-Id: I09f9b62e9d6de92f7114638d4a8fdd82024214da
 2017-03-07 00:40:57 +00:00
Winson Chung
baa7b721dc Small fixes and tweaks to PiP transition. 
- Fixing case where default bounds did not account for ime height
- Ensuring that we using the animating/target bounds when calculating
  the new ime-offset bounds
- Tweaking transition interpolators and durations

Bug: 35396882
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ia22ea0008d834c47a3f26bf2e1f484c72fae8736
 2017-03-06 16:39:40 -08:00
Mady Mellor
a7f69740b5 Update how PIP size is determined 
- minSize = 108dp
- defaultSmallestEdge = max(23% of screen width, minSize)
- the shortest edge of the PIP should be minSize and the rest scales
  according to the aspect ratio
- rather than a default PIP size, use default aspect ratio
- adding expand button
- fitting actions to spec

Fixes: 35358504
Test: manually used test app to try different aspect ratios
Change-Id: Ib6890fb7824889b9edeea7efb5b9771e64fc1514
Signed-off-by: Winson Chung <winsonc@google.com>
 2017-03-06 16:39:11 -08:00
Andre Eisenbach
9b3d4cb3a7 Merge "BluetoothManagerService: continue teardown when BLE apps registered" 
am: ba0992f4c4

Change-Id: Iac58de264ca48184d2ddd0cf4aeb9a3d5719539c
 2017-03-07 00:37:31 +00:00
Yang Ni
25684ceff5 Merge "Removed close guards for Element and Type objects" 
am: 97c9b57cec

Change-Id: I28b4149b6a0ace42dff2ca4ce9a1803b0baa4430
 2017-03-07 00:36:19 +00:00
Ta-wei Yen
9f2888d9cc Merge "Add EXTRA_PHONE_ACCOUNT_HANDLE for ACTION_SHOW_VOICEMAIL_NOTIFICATION" 2017-03-07 00:31:09 +00:00
Julia Reynolds
03fa85ddcc Prevent creation of default channel. 
Test: runtest systemui-notification
Change-Id: Id56debdca2a11bdac5ae11832eaaa04842f0a9be
 2017-03-07 00:17:19 +00:00