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
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
Michael Wright
962c9532a1
Add new media navigation keys.
...
Bug: 22059484
Change-Id: Idfe7fc5dd12acafc9f05c815d8aa7911cfcc7e4b
2015-08-13 16:44:27 +01:00
Stefan Kuhne
01da2fc7df
Merge "Adding API to access / change the task bounds"
2015-08-13 15:40:08 +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
Alan Viverette
eff1b7175d
Merge "Add popup theme to AutoCompleteTextView, clean up constructor"
2015-08-13 13:29:19 +00:00
Roozbeh Pournader
692adf6ae6
Merge "Fix unintentional NPE in SpannableStringBuilder."
2015-08-13 04:41:48 +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
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
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
Dianne Hackborn
1dd2f5a3eb
am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:18:13 +00:00
Dianne Hackborn
a54d4583ec
am 9512a857: am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '9512a857454d761b53f46958733ba23216c41e64':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:02:26 +00:00
Dianne Hackborn
9512a85745
am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 00:54:35 +00:00
Dianne Hackborn
ff9912d594
Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:59 +00:00
Deepanshu Gupta
8d38e7c905
Merge "Add StyleableRes annotation to TypedArray."
2015-08-13 00:25:54 +00:00
Dianne Hackborn
c3f7449517
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
2015-08-12 16:10:58 -07:00
Raph Levien
8cf6d865cf
am d202d15d: am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'd202d15d9e4845537c4409c9880eb269b2b59129':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:40:58 +00:00
Raph Levien
d202d15d9e
am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'cf2d44bee50dc2950181bbf5974c32eacea6f0a7':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:31:07 +00:00
Raph Levien
855a862f6d
am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69
am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:07:43 +00:00
Eino-Ville Talvala
b92e3968b0
am 159a16ab: am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '159a16ab79588d71aee5a10b1a4cd4a7f360ed9d':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 21:02:52 +00:00
Raph Levien
beabcb92cb
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
2015-08-12 21:00:07 +00:00
Alan Viverette
00cdbce6c3
Merge "Clear check mark resource ID when set from Drawable object"
2015-08-12 20:59:44 +00:00
Eino-Ville Talvala
159a16ab79
am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit 'f21ecd037e7d17626416e3247b83ab93d81d2559':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:53:52 +00:00
Jason Monk
3111d4e17a
Merge "Add Preference#onDetachedFromActivity"
2015-08-12 20:41:41 +00:00
Eino-Ville Talvala
6986410a59
am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '5679800f382918bb3ca159997609fc551f2a739a':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:32:53 +00:00
Alan Viverette
c60feca6a9
Clear check mark resource ID when set from Drawable object
...
Bug: 22626247
Change-Id: Ia32bc19512442fdf0d2c091d63a61f992545f2c2
2015-08-12 16:26:37 -04:00
Eino-Ville Talvala
5679800f38
am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:18:46 +00:00
Clara Bayarri
f95ed10d9d
Fix Insertion ActionMode not showing on RTL languages
...
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.
The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.
After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.
BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d
Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
2015-08-12 20:01:44 +00:00
Adrian Roos
96165f4396
am e77660d7: am ea73528c: am afdfc2c0: am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
...
* commit 'e77660d7f4e261f21e9d8d2098c451d55ccbc533':
Prevent overlap of color views in landscape
2015-08-12 19:48:49 +00:00
Alan Viverette
83109d6607
Merge "Add change type to ExploreByTouchHelper"
2015-08-12 19:46:56 +00:00
Jason Monk
e18dc50c63
Add Preference#onDetachedFromActivity
...
Change-Id: I7c78f96d41b33b902e54fe1c0b7246d555aab0ed
2015-08-12 15:27:51 -04:00
Alan Viverette
961cdbf10f
Add change type to ExploreByTouchHelper
...
Bug: 22095062
Change-Id: I9816af56f03f2b8551642ef202a0465dee00ec15
2015-08-12 15:22:01 -04:00
Adrian Roos
e77660d7f4
am ea73528c: am afdfc2c0: am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
...
* commit 'ea73528c66fda8e70b7672a2cbac7f80ea3686f2':
Prevent overlap of color views in landscape
2015-08-12 18:43:02 +00:00
Adrian Roos
afdfc2c04d
am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
...
* commit '192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372':
Prevent overlap of color views in landscape
2015-08-12 18:26:49 +00:00
Adrian Roos
192ca56d7a
am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
...
* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
Prevent overlap of color views in landscape
2015-08-12 18:16:32 +00:00
Adrian Roos
c0a4883d58
Merge "Prevent overlap of color views in landscape" into mnc-dev
2015-08-12 18:06:42 +00:00
Roozbeh Pournader
f995b852a6
Merge "Make FormatBytes() not use decimal points for size <= 900."
2015-08-12 17:54:47 +00:00
Todd Kennedy
47c8244e4e
Merge "Override package storage constraint"
2015-08-12 16:53:32 +00:00
Alan Viverette
da6b2f6ccb
Add popup theme to AutoCompleteTextView, clean up constructor
...
Bug: 22912507
Change-Id: I48d8b1ccae980847c743020d3f2a0d2eb6017e40
2015-08-12 11:26:15 -04:00
Alan Viverette
cd703b6235
Clean up Spinner constructor docs, final class vars
...
Change-Id: I8c7eef08718474bbdebe8eceaf34ebac4007d945
2015-08-12 11:14:33 -04:00