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 0578a725bf .
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
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
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
Bart Sears
a35ada4846
am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
...
* commit '3ab3ffc646f311f03f464e175f0d4f73c79c0d68':
Fix Keyguard drawn timeout
2015-08-13 05:51:48 +00:00
Bart Sears
3ab3ffc646
am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
...
* commit 'b7ae19905a471b0e0c74cd76b9895cad93856deb':
Fix Keyguard drawn timeout
2015-08-13 05:46:16 +00:00
Bart Sears
b7ae19905a
am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
...
* commit 'bd29b07eab3956796a7a09d7612e42e22616f458':
Fix Keyguard drawn timeout
2015-08-13 05:39:02 +00:00
Bart Sears
bd29b07eab
Merge "Fix Keyguard drawn timeout" into mnc-dev
2015-08-13 05:32:14 +00:00
Roozbeh Pournader
692adf6ae6
Merge "Fix unintentional NPE in SpannableStringBuilder."
2015-08-13 04:41:48 +00:00
Jorim Jaggi
0ca8da52f7
am 6fe7883f: am 4846c62a: am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev
...
* commit '6fe7883f0b164352fb9976d8597e7d0e7b0fe152':
Do not vibrate if we don't have a fingerprint client
2015-08-13 03:18:53 +00:00
Jorim Jaggi
61a5abcf96
am d5b3a35c: am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
...
* commit 'd5b3a35c14130deba54d9e72a10cce16adf7b99b':
Fix touch-to-wake while dozing
2015-08-13 03:18:25 +00:00
Jorim Jaggi
7b867f6173
Merge "Merge commit '80581f7a' into master"
2015-08-13 03:15:45 +00:00
Roozbeh Pournader
cd217b8ace
Fix unintentional NPE in SpannableStringBuilder.
...
Previously, when getSpans() was called with a null parameter, an
unintentional NullPointerException would be thrown.
Now, we explicitly return an empty array of Objects.
Bug: 19805521
Change-Id: I52f3ae08c2bcf62f6a4d0c01f0fe08ad1134abb8
2015-08-12 20:14:43 -07:00
Yohei Yukawa
35f743713d
Move IME related unit tests under core/tests/coretests/.
...
This CL moves existing (non-CTS) unit tests used for input
method under core/tests/coretests/ to reduce the maintenance
cost.
Although some package names and import lines are updated
to be consistent with new file locations, test cases are
are kept to be the same.
Change-Id: I4efce90b232458212ac48292dc01b812a9e851e5
2015-08-12 20:14:08 -07:00
Jorim Jaggi
559b8c5f4e
Merge commit '80581f7a' into master
...
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
2015-08-12 20:09:52 -07:00
Roozbeh Pournader
5e9ed365ad
Support strikethrough text in Html.fromHtml().
...
All the three tags, <del>, <s>, and <strike> are now converted to
strikethrough text.
Bug: 21025743
Change-Id: I62dc9793223e266f6e2181169766fde8be0e2aa7
2015-08-12 19:34:47 -07:00
Jorim Jaggi
6fe7883f0b
am 4846c62a: am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev
...
* commit '4846c62aa31dd7f60608199b2b63b7bf8bf0a0c0':
Do not vibrate if we don't have a fingerprint client
2015-08-13 02:20:03 +00:00
Jorim Jaggi
4846c62aa3
am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev
...
* commit '24cf83494844f1ce3c247660af61307366330c80':
Do not vibrate if we don't have a fingerprint client
2015-08-13 02:10:42 +00:00
Dianne Hackborn
d38e7c9387
am 1dd2f5a3: am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 02:10:15 +00:00