OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "QS vis tweaks" into oc-dev am: 2b2221e94b
Jason Monk [Fri, 2 Jun 2017 19:49:02 +0000 (19:49 +0000)]
Merge "QS vis tweaks" into oc-dev am: 2b2221e94b
am: abd4f9844f

Change-Id: I064bbbb8c0058adb03f74acf2331342b3d6f97c7

7 years agoMerge "Use rounded icons in QS"
TreeHugger Robot [Fri, 2 Jun 2017 19:42:20 +0000 (19:42 +0000)]
Merge "Use rounded icons in QS"

7 years agoMerge "QS vis tweaks" into oc-dev
Jason Monk [Fri, 2 Jun 2017 19:33:24 +0000 (19:33 +0000)]
Merge "QS vis tweaks" into oc-dev
am: 2b2221e94b

Change-Id: I5c153c1f6085de0ba5aa00273bde754d0ee149b3

7 years agoMerge "Protect instant apps from full apps"
Todd Kennedy [Fri, 2 Jun 2017 19:32:08 +0000 (19:32 +0000)]
Merge "Protect instant apps from full apps"

7 years agoMerge "QS vis tweaks" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 19:28:32 +0000 (19:28 +0000)]
Merge "QS vis tweaks" into oc-dev

7 years agoMerge "Update WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level"
TreeHugger Robot [Fri, 2 Jun 2017 18:58:06 +0000 (18:58 +0000)]
Merge "Update WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level"

7 years agoMerge "wifi: hotspot2: implement Parcelable class for OSU provider"
TreeHugger Robot [Fri, 2 Jun 2017 18:37:58 +0000 (18:37 +0000)]
Merge "wifi: hotspot2: implement Parcelable class for OSU provider"

7 years agoMerge "Track added/removed window when focus is null" into oc-dev am: e8f39b53d4
Wale Ogunwale [Fri, 2 Jun 2017 18:24:33 +0000 (18:24 +0000)]
Merge "Track added/removed window when focus is null" into oc-dev am: e8f39b53d4
am: cb58f5603a

Change-Id: I2bc86c8733f50371cac03302e4eec4368f337747

7 years agoMerge "Improve consistency in focusAfterDescendants behavior" into oc-dev am: 12ee4bd7a8
Evan Rosky [Fri, 2 Jun 2017 18:16:51 +0000 (18:16 +0000)]
Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev am: 12ee4bd7a8
am: c0ff11a4c5

Change-Id: I5ededc798b40b3c4c5279bb253a885199c31a440

7 years agoMerge "Track added/removed window when focus is null" into oc-dev
Wale Ogunwale [Fri, 2 Jun 2017 18:15:06 +0000 (18:15 +0000)]
Merge "Track added/removed window when focus is null" into oc-dev
am: e8f39b53d4

Change-Id: If6e54f88f66eed33e7d833663dcb7b032eb0080d

7 years agoMerge "Improve consistency in focusAfterDescendants behavior" into oc-dev
Evan Rosky [Fri, 2 Jun 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev
am: 12ee4bd7a8

Change-Id: I46212487711efebe8efa95bfa28f24e8ee24a2cf

7 years agoMerge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d am: 27bf5d8afd
Sooraj Sasindran [Fri, 2 Jun 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d am: 27bf5d8afd
am: 8fdc533007

Change-Id: I7ebce40dd4b6cf4f25d99fe1bc9803b5bce3c5d0

7 years agoMerge "Track added/removed window when focus is null" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 17:58:04 +0000 (17:58 +0000)]
Merge "Track added/removed window when focus is null" into oc-dev

7 years agoMerge "Improve consistency in focusAfterDescendants behavior" into oc-dev
Evan Rosky [Fri, 2 Jun 2017 17:56:22 +0000 (17:56 +0000)]
Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev

7 years agoMerge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c am: 7406715630
Sooraj Sasindran [Fri, 2 Jun 2017 17:53:03 +0000 (17:53 +0000)]
Merge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c am: 7406715630
am: d63cc7e976

Change-Id: I36e3ad6872d8107783262e42bf1975bce6654c20

7 years agoMerge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d
Sooraj Sasindran [Fri, 2 Jun 2017 17:47:13 +0000 (17:47 +0000)]
Merge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d
am: 27bf5d8afd

Change-Id: I57d969baaa3c9b46753f0f54d8d3f5a7cd836c58

7 years agoUse rounded icons in QS
Evan Laird [Mon, 15 May 2017 16:51:34 +0000 (12:51 -0400)]
Use rounded icons in QS

Updates for QS icon resources:
        - Airplane mode
        - Alarm
        - Bluetooth
        - Flashlight
        - Cast
        - Data saver
        - Do not disturb
        - Edit (pencil icon)
        - Nightlight
        - Invert colors
        - Location
        - Settings cog
        - Wifi
        - Hotspot

* also renamed resources to have canonical names (e.g.,
ic_qs_bluetooth.xml instead of ic_qs_bluetooth_enable/disable), because
we are drawing slashes at runtime.

Some resources need animations:
        - Rotation
        - expand/collapse caret
        - Hotspot transient

Test: visual
Change-Id: I342de13757aa378400ceb585d27776e72dc4fa4a

7 years agoMerge "Annotate test method visibility in WindowManager" into oc-dev am: 0b83588177
Alan Viverette [Fri, 2 Jun 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Annotate test method visibility in WindowManager" into oc-dev am: 0b83588177
am: 35eb249ebb

Change-Id: I3d20aa3c99046b6185695f8e85f7a61474620d4d

7 years agoMerge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c
Sooraj Sasindran [Fri, 2 Jun 2017 17:41:35 +0000 (17:41 +0000)]
Merge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c
am: 7406715630

Change-Id: Ic50f47187977fbc9163bc3de0a312040c9e6e273

7 years agoMerge "Testra RSSI compliance" am: 7466567d89
Sooraj Sasindran [Fri, 2 Jun 2017 17:38:02 +0000 (17:38 +0000)]
Merge "Testra RSSI compliance" am: 7466567d89
am: 1bb09a713d

Change-Id: I351f4bc774e57565691485f3bc16897807b02024

7 years agoMerge "Annotate test method visibility in WindowManager" into oc-dev
Alan Viverette [Fri, 2 Jun 2017 17:34:38 +0000 (17:34 +0000)]
Merge "Annotate test method visibility in WindowManager" into oc-dev
am: 0b83588177

Change-Id: I0393d702b3fd308dd16becefceea15f932fea599

7 years agoMerge "Testra RSSI compliance"
Sooraj Sasindran [Fri, 2 Jun 2017 17:31:39 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance"
am: 7466567d89

Change-Id: I8e348f6433bef87c28ac80e6778ecfd3dede6dc5

7 years agoMerge "Testra RSSI compliance" am: 542ebcd3fb
Sooraj Sasindran [Fri, 2 Jun 2017 17:31:34 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance" am: 542ebcd3fb
am: 69a3e67e3c

Change-Id: I53331fb51559ede536988061e43dece2b1d54456

7 years agoMerge "Annotate test method visibility in WindowManager" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 17:26:47 +0000 (17:26 +0000)]
Merge "Annotate test method visibility in WindowManager" into oc-dev

7 years agoMerge "Testra RSSI compliance"
Sooraj Sasindran [Fri, 2 Jun 2017 17:25:46 +0000 (17:25 +0000)]
Merge "Testra RSSI compliance"
am: 542ebcd3fb

Change-Id: I5c31472190dc06d1ae5c2c077248b8c8f65f54e8

7 years agoQS vis tweaks
Jason Monk [Fri, 2 Jun 2017 17:17:27 +0000 (13:17 -0400)]
QS vis tweaks

 - QS Header status centering 24dp -> 32dp
 - Several fonts condensed -> medium

Test: visual
Change-Id: Ic8bc08d6a4d78ee708c4a890140b87716a883373
Fixes: 38199857

7 years agoMerge "Testra RSSI compliance"
Treehugger Robot [Fri, 2 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Testra RSSI compliance"

7 years agoMerge "Testra RSSI compliance"
Treehugger Robot [Fri, 2 Jun 2017 17:16:41 +0000 (17:16 +0000)]
Merge "Testra RSSI compliance"

7 years agoUpdate WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level
Tomoharu Hatano [Wed, 26 Nov 2014 10:53:00 +0000 (19:53 +0900)]
Update WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level

Update WIFI_CONNECTION_STRENGTH in AccessPointPreference to have
correct ContentDescription according to split level of Wi-Fi signal
strength.

Bug: 62182689
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: Ic06601ccda3d81c30c694c3e4070e26c98bb110b
Signed-off-by: Masafumi Hasegawa <masafumi.x.hasegawa@sonymobile.com>
7 years agoMerge "Prevent showing voice session when it is already queued to be hidden." into...
Winson Chung [Fri, 2 Jun 2017 16:25:07 +0000 (16:25 +0000)]
Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev am: c672cb5ed9
am: 6d9ea8ec97

Change-Id: I9c0768835c6932c3ec4c55a26fdd63b0d5e6bac5

7 years agoMerge "MediaCodec: add CSD description for FLAC"
Wei Jia [Fri, 2 Jun 2017 16:16:36 +0000 (16:16 +0000)]
Merge "MediaCodec: add CSD description for FLAC"

7 years agoMerge "Prevent showing voice session when it is already queued to be hidden." into...
Winson Chung [Fri, 2 Jun 2017 16:13:20 +0000 (16:13 +0000)]
Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev
am: c672cb5ed9

Change-Id: I983396208aa1364884f6b90939c04ef58c2f432c

7 years agoMerge "Allow force resize message activity to be resumed" into oc-dev am: 8cb56d9082
Andrii Kulian [Fri, 2 Jun 2017 16:11:42 +0000 (16:11 +0000)]
Merge "Allow force resize message activity to be resumed" into oc-dev am: 8cb56d9082
am: 1f06e4582c

Change-Id: I48b02adeb9da4c7c3f0149812fd44ffbd2eb45f1

7 years agoMerge "Prevent showing voice session when it is already queued to be hidden." into...
Winson Chung [Fri, 2 Jun 2017 16:04:46 +0000 (16:04 +0000)]
Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev am...
Erik Kline [Fri, 2 Jun 2017 16:01:36 +0000 (16:01 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev am: 6d46bc2ed3  -s ours
am: 3f41d9df9f  -s ours

Change-Id: I11393f60920e04bf75ab99e9c49670bec29093c9

7 years agoMerge "Allow force resize message activity to be resumed" into oc-dev
Andrii Kulian [Fri, 2 Jun 2017 16:01:35 +0000 (16:01 +0000)]
Merge "Allow force resize message activity to be resumed" into oc-dev
am: 8cb56d9082

Change-Id: I7fd4ed727a0c548c5e444f77c856eb185427f605

7 years agoMerge "Allow force resize message activity to be resumed" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 15:55:34 +0000 (15:55 +0000)]
Merge "Allow force resize message activity to be resumed" into oc-dev

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev
Erik Kline [Fri, 2 Jun 2017 15:52:35 +0000 (15:52 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev
am: 6d46bc2ed3  -s ours

Change-Id: I719cc01343397345afd5fee9322e588b1b8336b3

7 years agoMerge "[WebView] Add multiprocess state to webviewupdate dumpState."
TreeHugger Robot [Fri, 2 Jun 2017 15:50:55 +0000 (15:50 +0000)]
Merge "[WebView] Add multiprocess state to webviewupdate dumpState."

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 15:44:42 +0000 (15:44 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev

7 years agoTrack added/removed window when focus is null
Wale Ogunwale [Fri, 2 Jun 2017 13:50:50 +0000 (06:50 -0700)]
Track added/removed window when focus is null

Improves the blaming of ANRs by determining if an app added windows
after it was launched.

Bug: 38121026
Test: Log inspection
Change-Id: Id86c1981150cf546c92d786ad45d5c2dda5573e0

7 years agoMerge "Fix night display activation behavior after reboot" into oc-dev am: bd75ee0015
Christine Franks [Fri, 2 Jun 2017 15:21:57 +0000 (15:21 +0000)]
Merge "Fix night display activation behavior after reboot" into oc-dev am: bd75ee0015
am: 16c9c94e49

Change-Id: I6806c3bde4a4739b2e8387840f706e753029d82b

7 years agoMerge "Fix night display activation behavior after reboot" into oc-dev
Christine Franks [Fri, 2 Jun 2017 15:15:56 +0000 (15:15 +0000)]
Merge "Fix night display activation behavior after reboot" into oc-dev
am: bd75ee0015

Change-Id: I6c8002fc4ac63f27343a27148c6a18e349a6b883

7 years agoMerge "Fix night display activation behavior after reboot" into oc-dev
Christine Franks [Fri, 2 Jun 2017 15:07:19 +0000 (15:07 +0000)]
Merge "Fix night display activation behavior after reboot" into oc-dev

7 years agoMerge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev am: fd0b15c196
Geoffrey Pitsch [Fri, 2 Jun 2017 14:59:56 +0000 (14:59 +0000)]
Merge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev am: fd0b15c196
am: cd020cc63e

Change-Id: Ifb212ff7f554a7c851db2df8c98ff3fbc45209b0

7 years agoMerge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev
Geoffrey Pitsch [Fri, 2 Jun 2017 14:50:54 +0000 (14:50 +0000)]
Merge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev
am: fd0b15c196

Change-Id: I56ff2491ee5fd1d72f215e41a4d6ee2ee535ab8a

7 years agoMerge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 14:44:21 +0000 (14:44 +0000)]
Merge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev

7 years agoHandle Wi-Fi passing explicit interface name and AP/IP mode
Erik Kline [Wed, 31 May 2017 06:53:53 +0000 (15:53 +0900)]
Handle Wi-Fi passing explicit interface name and AP/IP mode

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 31466854
Bug: 32163131
Bug: 62018531
Bug: 62076211
Merged-In: I599813c4b4d866623344df56f62ed6a40b4025d6
Merged-In: I8f1d172a3514e4fb9230af9e09aeaf638f03091c
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe
(cherry picked from commit 2efb827f61db989ab55792052c99713ef5f5eefa)

7 years agoMerge "Round the corners of the mobile signal status bar icon"
TreeHugger Robot [Fri, 2 Jun 2017 13:35:13 +0000 (13:35 +0000)]
Merge "Round the corners of the mobile signal status bar icon"

7 years agoProtect instant apps from full apps
Todd Kennedy [Thu, 1 Jun 2017 20:18:09 +0000 (13:18 -0700)]
Protect instant apps from full apps

Bug: 35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: I1835fe58256377f901db38fcc3e4c98886d799ac

7 years agoMerge "Revisions to Inline Controls for unblockable apps"
TreeHugger Robot [Fri, 2 Jun 2017 13:09:20 +0000 (13:09 +0000)]
Merge "Revisions to Inline Controls for unblockable apps"

7 years ago[WebView] Add multiprocess state to webviewupdate dumpState.
Gustav Sennton [Fri, 2 Jun 2017 10:20:18 +0000 (11:20 +0100)]
[WebView] Add multiprocess state to webviewupdate dumpState.

Whether WebView multiprocess is enabled can be important to know when
debugging WebView-related issues.

Bug: 38501129
Test: Ensure that bugreport contains WebView multiprocess state.
Change-Id: I037de0e981d4b731f0da7e5982815facf5d38a43

7 years agoMerge "Use TotalTime instead of ThisTime in app launch test"
TreeHugger Robot [Fri, 2 Jun 2017 06:13:28 +0000 (06:13 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test"

7 years agoUse TotalTime instead of ThisTime in app launch test
gopinath [Fri, 2 Jun 2017 00:28:36 +0000 (17:28 -0700)]
Use TotalTime instead of ThisTime in app launch test

Bug: 62272543

Test: Tested with calculator and facebook messenger launch

Change-Id: Ide4e844e54428edcb7e3356cb3d0492392f6bde3

7 years agoTestra RSSI compliance
Sooraj Sasindran [Tue, 9 May 2017 22:00:55 +0000 (15:00 -0700)]
Testra RSSI compliance

Devices that support 4 bar signal strength
indication should display the bars as follow:

4 bar   RSRP   > -90
3 bar   -90 ≥    RSRP   > -100
2 bar  -100 ≥   RSRP   > -115
1 bar   -115 ≥  RSRP   > -120
0 bar   RSRP    ≤ -120
      or No Sync to LTE Reference Signals

Bug=37187586

Change-Id: I2a76aabdf6d8ef1be3a05a90643b1e670f929bc3

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e...
Erik Kline [Fri, 2 Jun 2017 05:46:47 +0000 (05:46 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e am: 1536453059 am: 00956c4f7c
am: 729c31c2e9

Change-Id: I8f1d172a3514e4fb9230af9e09aeaf638f03091c

7 years agoTestra RSSI compliance
Sooraj Sasindran [Fri, 12 May 2017 00:36:37 +0000 (17:36 -0700)]
Testra RSSI compliance

Devices that support 4 bar signal strength
indication should display the bars as follow:

4 bar   RSRP   > -90
3 bar   -90 ≥    RSRP   > -100
2 bar  -100 ≥   RSRP   > -115
1 bar   -115 ≥  RSRP   > -120
0 bar   RSRP    ≤ -120
      or No Sync to LTE Reference Signals

Add support for mnc 11, 71 and 72

BUG=37187586

Change-Id: Ia0a71707d1cbc20887bcc00c0519833b522b4a95

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e...
Erik Kline [Fri, 2 Jun 2017 05:39:23 +0000 (05:39 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e am: 1536453059
am: 00956c4f7c

Change-Id: I599813c4b4d866623344df56f62ed6a40b4025d6

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e
Erik Kline [Fri, 2 Jun 2017 05:32:50 +0000 (05:32 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e
am: 1536453059

Change-Id: I4a9a99c72f8a1d70355d1bf910530ca50cab8a77

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode"
Erik Kline [Fri, 2 Jun 2017 05:26:49 +0000 (05:26 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode"
am: 3478ff8c9e

Change-Id: I489f7e6b8ca4af584879a4c9e8f00570da6e400c

7 years agoMerge "Handle Wi-Fi passing explicit interface name and AP/IP mode"
Treehugger Robot [Fri, 2 Jun 2017 05:19:31 +0000 (05:19 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode"

7 years agoHandle Wi-Fi passing explicit interface name and AP/IP mode
Erik Kline [Wed, 31 May 2017 06:53:53 +0000 (15:53 +0900)]
Handle Wi-Fi passing explicit interface name and AP/IP mode

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 31466854
Bug: 32163131
Bug: 62076211
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe

7 years agoMerge "AAPT2: Allow any value type for <item> without format attr" into oc-dev am...
Adam Lesinski [Fri, 2 Jun 2017 03:04:42 +0000 (03:04 +0000)]
Merge "AAPT2: Allow any value type for <item> without format attr" into oc-dev am: 1ac325e4d5
am: 3c860ed41d

Change-Id: I44719ae4d742b518f59c9c9bbc226ec9773ce365

7 years agoMerge "WifiManager: add unspecified ip mode" am: dae92faa02 am: 0b9fa27619 am: 610a0d...
Rebecca Silberstein [Fri, 2 Jun 2017 03:02:40 +0000 (03:02 +0000)]
Merge "WifiManager: add unspecified ip mode" am: dae92faa02 am: 0b9fa27619 am: 610a0db7a2  -s ours
am: 74ff0748ce  -s ours

Change-Id: I71fa9c7e5c8e5efcf864b5fee10b5ebc929f8a55

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 9f7e653d56 -s ours
Bill Yi [Fri, 2 Jun 2017 03:00:33 +0000 (03:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 9f7e653d56  -s ours
am: 8c9c497737  -s ours

Change-Id: I955759d1d429def8c4409fe083e256b2b68fd080

7 years agoMerge "Merge "Enabled (asymmetric) tab selection in GridView" into oc-dev am: 3653aed...
Android Build Merger (Role) [Fri, 2 Jun 2017 02:53:56 +0000 (02:53 +0000)]
Merge "Merge "Enabled (asymmetric) tab selection in GridView" into oc-dev am: 3653aed87b am: f742df0ba1"

7 years agoMerge "Enabled (asymmetric) tab selection in GridView" into oc-dev am: 3653aed87b
Evan Rosky [Fri, 2 Jun 2017 02:52:44 +0000 (02:52 +0000)]
Merge "Enabled (asymmetric) tab selection in GridView" into oc-dev am: 3653aed87b
am: f742df0ba1

Change-Id: I2d84da452136d2dda45d0f16034ecd35397179f7

7 years agoMerge "Merge "AutoSize TextView - major fixes" into oc-dev am: b34c9d3a33 am: d549197c90"
Android Build Merger (Role) [Fri, 2 Jun 2017 02:50:40 +0000 (02:50 +0000)]
Merge "Merge "AutoSize TextView - major fixes" into oc-dev am: b34c9d3a33 am: d549197c90"

7 years agoMerge "AutoSize TextView - major fixes" into oc-dev am: b34c9d3a33
Siyamed Sinir [Fri, 2 Jun 2017 02:49:26 +0000 (02:49 +0000)]
Merge "AutoSize TextView - major fixes" into oc-dev am: b34c9d3a33
am: d549197c90

Change-Id: I605026459c929fc2aa7d82b376ebd059c5b95441

7 years agoMerge "Update documentation for postmessage method"
TreeHugger Robot [Fri, 2 Jun 2017 02:49:01 +0000 (02:49 +0000)]
Merge "Update documentation for postmessage method"

7 years agoMerge "Remove BatteryInfo from settingslib"
TreeHugger Robot [Fri, 2 Jun 2017 02:48:22 +0000 (02:48 +0000)]
Merge "Remove BatteryInfo from settingslib"

7 years agoMerge "AAPT2: Allow any value type for <item> without format attr" into oc-dev
Adam Lesinski [Fri, 2 Jun 2017 02:35:07 +0000 (02:35 +0000)]
Merge "AAPT2: Allow any value type for <item> without format attr" into oc-dev
am: 1ac325e4d5

Change-Id: I1b1180f2b33a077b2c46a8466c58d83ed618576e

7 years agoMerge "AAPT2: Allow any value type for <item> without format attr" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 02:30:57 +0000 (02:30 +0000)]
Merge "AAPT2: Allow any value type for <item> without format attr" into oc-dev

7 years agoMerge "WifiManager: add unspecified ip mode" am: dae92faa02 am: 0b9fa27619
Rebecca Silberstein [Fri, 2 Jun 2017 01:51:01 +0000 (01:51 +0000)]
Merge "WifiManager: add unspecified ip mode" am: dae92faa02 am: 0b9fa27619
am: 610a0db7a2  -s ours

Change-Id: I2ca161f16ec04a12f4bae55ca7ee7a31558d51fb

7 years agoMerge changes from topic 'lockscreen_themes'
TreeHugger Robot [Fri, 2 Jun 2017 01:48:55 +0000 (01:48 +0000)]
Merge changes from topic 'lockscreen_themes'

* changes:
  Change keyguard theme when wallpaper colors change
  Themeable keyguard clock
  Use theme color on transient text
  Keyguard icon colors matching light or dark theme

7 years agoMerge "WifiManager: add unspecified ip mode" am: dae92faa02
Rebecca Silberstein [Fri, 2 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "WifiManager: add unspecified ip mode" am: dae92faa02
am: 0b9fa27619

Change-Id: I52a0e54bf024ffa6871fb8edbcda3301e7e7fbed

7 years agoMerge "WifiManager: add unspecified ip mode"
Rebecca Silberstein [Fri, 2 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "WifiManager: add unspecified ip mode"
am: dae92faa02

Change-Id: Ia8fe528fd7cbe8076ea185d21ae7dcfd5654334c

7 years agoMerge "WifiManager: add unspecified ip mode"
Treehugger Robot [Fri, 2 Jun 2017 01:26:14 +0000 (01:26 +0000)]
Merge "WifiManager: add unspecified ip mode"

7 years agoAllow force resize message activity to be resumed
Andrii Kulian [Fri, 2 Jun 2017 00:49:02 +0000 (17:49 -0700)]
Allow force resize message activity to be resumed

"Activity may not work with split-screen" message is not showing
because the overlay activity is not allowed to resume without
user action.

Bug: 36205249
Test: Launch an activity with target SDK < 25, enable split-screen
Test: go/wm-smoke
Change-Id: Ic796f4449df1307c75ca5445cbffab218f0f8ae3

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 2 Jun 2017 01:07:55 +0000 (01:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 9f7e653d56  -s ours

Change-Id: Iafbfa3a35c305d284ad3a2a2ed06782b80768f7f

7 years agoMerge "Enabled (asymmetric) tab selection in GridView" into oc-dev
Evan Rosky [Fri, 2 Jun 2017 00:59:34 +0000 (00:59 +0000)]
Merge "Enabled (asymmetric) tab selection in GridView" into oc-dev
am: 3653aed87b

Change-Id: Icffef176e1dc3de49191414e57fdf38c4073bff2

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 00:57:46 +0000 (00:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoRemove BatteryInfo from settingslib
Salvador Martinez [Tue, 30 May 2017 18:41:22 +0000 (11:41 -0700)]
Remove BatteryInfo from settingslib

This file has been moved back into Settings. Also removes unused
code from BatterySaverTile that depends on BatteryInfo.

Test: settingslib tests still pass
Bug: 38398949
Bug: 38399654
Change-Id: Ia40c4014854e87ebb467b5e88fa05afe1f340be3

7 years agoMerge "Enabled (asymmetric) tab selection in GridView" into oc-dev
Evan Rosky [Fri, 2 Jun 2017 00:45:09 +0000 (00:45 +0000)]
Merge "Enabled (asymmetric) tab selection in GridView" into oc-dev

7 years agoMerge "AutoSize TextView - major fixes" into oc-dev
Siyamed Sinir [Fri, 2 Jun 2017 00:23:55 +0000 (00:23 +0000)]
Merge "AutoSize TextView - major fixes" into oc-dev
am: b34c9d3a33

Change-Id: Iec698f291365adf367dd318eaf2d0752f109e82c

7 years agoMerge "AutoSize TextView - major fixes" into oc-dev
Siyamed Sinir [Fri, 2 Jun 2017 00:18:03 +0000 (00:18 +0000)]
Merge "AutoSize TextView - major fixes" into oc-dev

7 years agoAAPT2: Allow any value type for <item> without format attr
Adam Lesinski [Fri, 2 Jun 2017 00:16:44 +0000 (17:16 -0700)]
AAPT2: Allow any value type for <item> without format attr

TO bring AAPT2 behavior in-line with AAPT, <item> has a default
format of "any", and only becomes restricted with an explicit format
attribute.

Bug: 62260121
Test: make aapt2_tests
Change-Id: Ife416f520e6c2710bb30e3ba3f2d4463794bfa06

7 years agoMerge "Fix AVD memory leak" into oc-dev am: 98db1264d4
Doris Liu [Fri, 2 Jun 2017 00:13:48 +0000 (00:13 +0000)]
Merge "Fix AVD memory leak" into oc-dev am: 98db1264d4
am: 3903501845

Change-Id: Ia20340072aa57e9cdcbd0d00d8de9bb62aa98977

7 years agoMerge "Fix ANR & Crash on Ryu" into oc-dev am: 6890dc95d0
John Reck [Fri, 2 Jun 2017 00:03:37 +0000 (00:03 +0000)]
Merge "Fix ANR & Crash on Ryu" into oc-dev am: 6890dc95d0
am: 7e206e5d66

Change-Id: I5da5af01d7ba897f964e6e5356f12ac01681ca43

7 years agoMerge "Fix AVD memory leak" into oc-dev
Doris Liu [Fri, 2 Jun 2017 00:00:38 +0000 (00:00 +0000)]
Merge "Fix AVD memory leak" into oc-dev
am: 98db1264d4

Change-Id: If5b68f8f34691a5fdac3ec047048ad2c09b1761f

7 years agoMerge "Fix ANR & Crash on Ryu" into oc-dev
John Reck [Thu, 1 Jun 2017 23:55:23 +0000 (23:55 +0000)]
Merge "Fix ANR & Crash on Ryu" into oc-dev
am: 6890dc95d0

Change-Id: I5f0a2fc7ab40b702e3e81ceb3bebd8ef44d22298

7 years agoMerge "Optimised hwui rounded corners shader" am: d7287c96eb am: ed7bdd6549 am: 92ef0...
Arun [Thu, 1 Jun 2017 23:53:13 +0000 (23:53 +0000)]
Merge "Optimised hwui rounded corners shader" am: d7287c96eb am: ed7bdd6549 am: 92ef0a59f8
am: 11e44273dc

Change-Id: Iad6d7763cb5e1d4524b7a4a48fec333f90a597e5

7 years agoMerge "Fix AVD memory leak" into oc-dev
Doris Liu [Thu, 1 Jun 2017 23:46:18 +0000 (23:46 +0000)]
Merge "Fix AVD memory leak" into oc-dev

7 years agoMerge "Fix ANR & Crash on Ryu" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 23:43:55 +0000 (23:43 +0000)]
Merge "Fix ANR & Crash on Ryu" into oc-dev

7 years agoMerge "Optimised hwui rounded corners shader" am: d7287c96eb am: ed7bdd6549
Arun [Thu, 1 Jun 2017 23:42:06 +0000 (23:42 +0000)]
Merge "Optimised hwui rounded corners shader" am: d7287c96eb am: ed7bdd6549
am: 92ef0a59f8

Change-Id: I9f5e6ef057ba6049804226d65f2f2f06594efc69

7 years agoMerge "Directly focus button in touchmode coretests" into oc-dev am: 6797a20a86
Evan Rosky [Thu, 1 Jun 2017 23:41:28 +0000 (23:41 +0000)]
Merge "Directly focus button in touchmode coretests" into oc-dev am: 6797a20a86
am: 0956df6ed2

Change-Id: Iacc9eb0da385ac50d37d3165fef850f2bff1cf9f

7 years agoMerge "Optimised hwui rounded corners shader" am: d7287c96eb
Arun [Thu, 1 Jun 2017 23:33:26 +0000 (23:33 +0000)]
Merge "Optimised hwui rounded corners shader" am: d7287c96eb
am: ed7bdd6549

Change-Id: I6acba9bd707a3beec41439cd86cce4cdea6d8b69

7 years agoMerge "Directly focus button in touchmode coretests" into oc-dev
Evan Rosky [Thu, 1 Jun 2017 23:30:48 +0000 (23:30 +0000)]
Merge "Directly focus button in touchmode coretests" into oc-dev
am: 6797a20a86

Change-Id: I5aa0b42e08ba9e8c93c9795bc787907336aa6b19

7 years agoMerge "Optimised hwui rounded corners shader"
Arun [Thu, 1 Jun 2017 23:24:50 +0000 (23:24 +0000)]
Merge "Optimised hwui rounded corners shader"
am: d7287c96eb

Change-Id: Idf53faac924be91d4e23da91b54c9ca08be9ad39

7 years agoMerge "Directly focus button in touchmode coretests" into oc-dev
Evan Rosky [Thu, 1 Jun 2017 23:21:25 +0000 (23:21 +0000)]
Merge "Directly focus button in touchmode coretests" into oc-dev