John Reck
d6d6843aaa
Remove unneeded main.cpp
...
BUILD_NATIVE_TEST actually includes
a main, so this is potentially conflicting
Change-Id: Ic1e60ab3c005417e8aef3d3521409ea034616764
2015-08-14 14:34:17 -07:00
Maurice Lam
bead6bcc61
Merge "[ExploreByTouchHelper] Make a11y calls on views"
2015-08-13 21:46:54 +00:00
Joe Fernandez
910ddce7cd
am 723e189e: am 5169535f: am a1bed325: am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
...
* commit '723e189e4853f5a6af8db5e5693ee99e4805d2db':
docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 21:07:14 +00:00
Joe Fernandez
feb6c0137a
am b854bced: am 9b8bc3dc: am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
...
* commit 'b854bced88d7ca46284830d9f6b728e2f2363929':
docs: Update developer docs make file to include API 23
2015-08-13 21:07:06 +00:00
Skuhne
969a49da77
Fixing build stopper
...
Change-Id: I2ea18b1b533e8eb4da2c286c22c559dda94d5108
2015-08-13 13:59:26 -07:00
Stefan Kuhne
e3928ca01d
Merge "Fixing layouting issues with NonClientDecorView"
2015-08-13 20:30:18 +00:00
Skuhne
f7b882c9c6
Fixing layouting issues with NonClientDecorView
...
Also fixing focus issue where the non client decor view
focus bar could aquire the focus.
Bug: 22984173
Bug: 23115816
Change-Id: Id0e6645004404018ea29dd035ea8a15275e12da9
2015-08-13 13:25:53 -07:00
Alan Viverette
02e8c2d418
Merge "Rebase system theme on configuration change"
2015-08-13 20:06:18 +00:00
Alan Viverette
c87ad53299
Merge "Temporary revert "Clean up phone window save/restore""
2015-08-13 20:05:53 +00:00
Alan Viverette
eae66cd2c9
Temporary revert "Clean up phone window save/restore"
...
This reverts commit 0578a725bf6905267b9caed6f5a8cedb2946e71e.
Change-Id: Ic460a0a7785a6829aab9963191714120859d36b0
2015-08-13 20:05:35 +00:00
Chong Zhang
055f9e1772
Merge "Handle activity launch for background users"
2015-08-13 20:04:19 +00:00
Yohei Yukawa
fbb9c71d5f
Merge "Move IME related unit tests under core/tests/coretests/."
2015-08-13 19:45:15 +00:00
Alan Viverette
e38e547d98
Merge "Clean up phone window save/restore"
2015-08-13 19:38:44 +00:00
Alan Viverette
0578a725bf
Clean up phone window save/restore
...
Comment clean up, final declarations only. No functional changes.
Change-Id: Ied118bcbd0462e2bf9745dee683d9e54a9767b1a
2015-08-13 15:31:25 -04:00
Joe Fernandez
723e189e48
am 5169535f: am a1bed325: am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
...
* commit '5169535ff70284e9c92043023b6c4f4e918b2aa1':
docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 19:27:41 +00:00
Joe Fernandez
5169535ff7
am a1bed325: am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
...
* commit 'a1bed325f65fa08087460fa02c7139f9c427fdbd':
docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 19:16:00 +00:00
Joe Fernandez
a1bed325f6
am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
...
* commit 'e41c18d629d65e302d4c40f2582845225da0d4f4':
docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 19:08:54 +00:00
Joe Fernandez
b854bced88
am 9b8bc3dc: am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
...
* commit '9b8bc3dcba4aa0a2eb5cd3fcb19226c476e4b8d6':
docs: Update developer docs make file to include API 23
2015-08-13 18:56:07 +00:00
Joe Fernandez
e41c18d629
am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
...
* commit 'f75577295765ca13bf3d0d5bffa81b569cb88da2':
docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 18:55:46 +00:00
Joe Fernandez
f755772957
Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
2015-08-13 18:49:40 +00:00
Joe Fernandez
9b8bc3dcba
am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
...
* commit 'db5b38b23c629b18b9a92956c68f82dbaa4e22ef':
docs: Update developer docs make file to include API 23
2015-08-13 18:48:12 +00:00
Joe Fernandez
901f807143
docs: Update uses-sdk-element page with API 23 (M) listing
...
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
2015-08-13 11:45:23 -07:00
Joe Fernandez
db5b38b23c
am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
...
* commit '195b1fd2b1fbbd25bb18e263489f58a7b14a0139':
docs: Update developer docs make file to include API 23
2015-08-13 18:42:51 +00:00
Joe Fernandez
195b1fd2b1
am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
...
* commit '8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
docs: Update developer docs make file to include API 23
2015-08-13 18:33:47 +00:00
Chong Zhang
45c25ceb3a
Handle activity launch for background users
...
- When launching activities in background, do not move the
target stack to front or resume the top activity, it should
have no observable effect to current user.
- Add the launched background task to recents so that they
can be found when the background user becomes current.
- Keep track of the last accessed stack for background user,
so that we know which stack to start with when that user goes
current
bug: 22929608
Change-Id: I0421a6b490251503df7a7e71465b8aae5138eb2d
2015-08-13 11:29:51 -07:00
Joe Fernandez
8d149d7ff2
Merge "docs: Update developer docs make file to include API 23" into mnc-dev
2015-08-13 18:27:11 +00:00
Michael Wright
df10f498b9
Merge "Add new media navigation keys."
2015-08-13 15:55:41 +00:00
Mike Dodd
3ecc60b831
am 8f517093: am 80ca7d27: am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '8f517093f27003a4d1c6e8fb083e1a8995bfeb2d':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:54:46 +00:00
Michael Wright
962c9532a1
Add new media navigation keys.
...
Bug: 22059484
Change-Id: Idfe7fc5dd12acafc9f05c815d8aa7911cfcc7e4b
2015-08-13 16:44:27 +01:00
Mike Dodd
8f517093f2
am 80ca7d27: am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '80ca7d2794138c047dd54317a73e8ee292e1aa02':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:43:45 +00:00
Alan Viverette
b72d41da78
Merge "Allow translucent and hidden system bars when EBT is turned on"
2015-08-13 15:42:23 +00:00
Alan Viverette
817f3cd445
Allow translucent and hidden system bars when EBT is turned on
...
Bug: 21730477
Change-Id: I4fbbe3b86ef41de7d58c37e17957a885d01895e6
2015-08-13 11:41:12 -04:00
Stefan Kuhne
01da2fc7df
Merge "Adding API to access / change the task bounds"
2015-08-13 15:40:08 +00:00
Mike Dodd
80ca7d2794
am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '28918812028f69a6e2c81f56b31724edd35307ce':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:36:22 +00:00
Skuhne
ce2faa5871
Adding API to access / change the task bounds
...
Bug: 21738328
Change-Id: I3aabcbe1dcc5caa70f66554157f41fbfacf4c50f
2015-08-13 08:31:43 -07:00
Mike Dodd
2891881202
am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '045ffe31056b340fb962c4fef3ed3dbf00b5d251':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:30:12 +00:00
John Reck
25f8da9b6a
Merge "Support new EGL extensions"
2015-08-13 15:26:55 +00:00
Mike Dodd
045ffe3105
am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '226ae04df4b3570d11b66d52a404b2c8b2ac50db':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:22:48 +00:00
Mike Dodd
226ae04df4
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
2015-08-13 15:16:39 +00:00
Jason Monk
48d520920b
am 3e46cc6e: am a7e07fde: am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
...
* commit '3e46cc6ed7c19a85059157a36c2a7fa4991eec1e':
Add more intelligence to bluetooth connection state
2015-08-13 15:14:14 +00:00
Jason Monk
3e46cc6ed7
am a7e07fde: am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
...
* commit 'a7e07fded12f7bd4198fd80f6e22ea1deabda43c':
Add more intelligence to bluetooth connection state
2015-08-13 15:07:36 +00:00
Jason Monk
a7e07fded1
am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
...
* commit '1f567039e042314d378b4fb50279e81d773e8733':
Add more intelligence to bluetooth connection state
2015-08-13 14:59:15 +00:00
Jason Monk
1f567039e0
am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
...
* commit '60823dc1f90198ab2ec0e8b62cb03900251fcf77':
Add more intelligence to bluetooth connection state
2015-08-13 14:52:30 +00:00
Jason Monk
60823dc1f9
am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
...
* commit '90460c79d1af214e73428eac92b5761e743dec4d':
Add more intelligence to bluetooth connection state
2015-08-13 14:44:55 +00:00
Jason Monk
90460c79d1
Merge "Add more intelligence to bluetooth connection state" into mnc-dev
2015-08-13 14:38:46 +00:00
Alan Viverette
eff1b7175d
Merge "Add popup theme to AutoCompleteTextView, clean up constructor"
2015-08-13 13:29:19 +00:00
Bart Sears
80e33f12e3
am 54bc30df: am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
...
* commit '54bc30df5a0211a026e5f804b3ea26dd6a626723':
Fix Keyguard drawn timeout
2015-08-13 06:55:15 +00:00
Daichi Hirono
630be43c1c
Merge "Let MTPDocumentsProvider load documents in background thread."
2015-08-13 06:50:12 +00:00
Daichi Hirono
6baa16e910
Let MTPDocumentsProvider load documents in background thread.
...
The CL introduce DocumentLoader class that has a responsibility for loading
documents on background thread. When the provider is requested documents and the
result is not cached, it returns the cursor containing the first 10 items with
extra loading flag. Then it loads the rest of documents into cache on background
thread and notifies update regularly.
BUG=23067619
Change-Id: I7ac9d919bc3ffee1960ae3e8e7272a792a982ea8
2015-08-13 15:47:19 +09:00
Bart Sears
54bc30df5a
am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
...
* commit 'a35ada4846d3794408825c10ee8a6070a1590044':
Fix Keyguard drawn timeout
2015-08-13 06:43:24 +00:00