Alan Viverette
6d163bcce5
am f2fea136: am dbb79ae9: am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
...
* commit 'f2fea1363b239dbfbd21f9449cfde8542320a34a':
Revert two changes to LinearLayout measurement
2015-08-01 17:54:19 +00:00
Dianne Hackborn
f6f1a7ec99
am 628b4125: am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
...
* commit '628b4125843b93dc7f3ed0c9bbea76ff470d2eed':
Change MNC codename to just M.
2015-08-01 17:53:09 +00:00
Alan Viverette
f2fea1363b
am dbb79ae9: am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
...
* commit 'dbb79ae9dc457bcb97794f718c6d3aa7fc4a19ca':
Revert two changes to LinearLayout measurement
2015-08-01 17:05:28 +00:00
Dianne Hackborn
628b412584
am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
...
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
Change MNC codename to just M.
2015-08-01 17:04:28 +00:00
Alan Viverette
5cca30a4ee
Merge "Revert two changes to LinearLayout measurement" into mnc-dev
2015-07-31 21:30:48 +00:00
Dianne Hackborn
c1836bb0f1
Merge "Change MNC codename to just M." into mnc-dev
2015-07-31 17:11:58 +00:00
Alan Viverette
5a969dfd8e
Revert two changes to LinearLayout measurement
...
"Include non-zero dimension views in excess space calculation" and
"Always distribute excess space in LinearLayout measurement" changed
LinearLayout behavior significantly in a way that wasn't covered by
CTS tests.
This reverts commits da2f3044094fabc02158
2015-07-31 12:42:10 -04:00
Dave Langemak
1b748f77d3
am 66cff122: am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
...
* commit '66cff122cc6d123b947be5f28186dc233a7be1aa':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
2015-07-31 03:23:50 +00:00
Dave Langemak
66cff122cc
am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
...
* commit '2e802cac1dc036e62d6744d07d0cad56eb37052a':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
2015-07-31 03:18:01 +00:00
Dan Sandler
4b67713709
Make DateTimeView more robust to weird contexts.
...
In particular, some clients (*ahem* SystemUI) have been
known to inflate RemoteViews with unusual derived contexts
that may not have valid application contexts. DateTimeView
can now resist this.
Bug: 22852700
Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54
2015-07-30 22:33:12 -04:00
Dan Sandler
706274f7ff
Make the RemoteViews context safe for Icons.
...
Icon needs the RemoteViews' internal context to reflect not
just the Resources of the originating application, but its
package name as well.
Bug: 22840771
Bug: 22852700
Change-Id: I1164cd38d99283982b00daadcf927c7cf63539b3
2015-07-30 22:32:54 -04:00
Alan Viverette
d46304cfd6
am 30a7a77f: am 38271527: am 82c14e68: am 92360585: am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
...
* commit '30a7a77f7792f48ee635658b0de546c81503859d':
Include non-zero dimension views in excess space calculation
2015-07-30 17:44:42 +00:00
Alan Viverette
30a7a77f77
am 38271527: am 82c14e68: am 92360585: am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
...
* commit '382715273d962f2be27bb5948a61efbf234bfaba':
Include non-zero dimension views in excess space calculation
2015-07-30 17:33:30 +00:00
Dan Sandler
ba36e0c2d1
am acb8f91d: am 936420a0: am 06e544f0: am a93ed128: am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
...
* commit 'acb8f91d107c209d02f72166056b1480d8e00d68':
DateTimeView: don't assume you have an ApplicationContext.
2015-07-30 17:19:19 +00:00
Dan Sandler
acb8f91d10
am 936420a0: am 06e544f0: am a93ed128: am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
...
* commit '936420a06232dfc68a021b8fb407e423c6ac69a3':
DateTimeView: don't assume you have an ApplicationContext.
2015-07-30 17:10:11 +00:00
Alan Viverette
559daf7a74
Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
2015-07-30 17:02:45 +00:00
Dan Sandler
7bd8e6a8f2
DateTimeView: don't assume you have an ApplicationContext.
...
Bug: 22840771
Change-Id: I3be6369936f90e9ce4e61a59ea81b0d3408a0f99
2015-07-30 11:59:30 -04:00
Alan Viverette
da2f304409
Include non-zero dimension views in excess space calculation
...
Bug: 22840778
Change-Id: Iba44c59bbaa48f63b26f342e0510b4c421e8748b
2015-07-30 11:44:12 -04:00
Daniel Sandler
8515917246
am 202dd44a: am 5ea22216: am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
...
* commit '202dd44a90439eb823566b718c5a8fb159d73a73':
Fully support Icons in Notification actions.
Fix media notification action icons.
2015-07-30 04:05:19 +00:00
Daniel Sandler
202dd44a90
am 5ea22216: am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
...
* commit '5ea22216dda8cd13f68f4dc8f405c9809d6c9e37':
Fully support Icons in Notification actions.
Fix media notification action icons.
2015-07-30 03:52:22 +00:00
Daniel Sandler
bbe1682b16
Merge changes from topic 'fix-media-notifications' into mnc-dev
...
* changes:
Fully support Icons in Notification actions.
Fix media notification action icons.
2015-07-30 02:57:06 +00:00
Dan Sandler
0bacba189f
am ea5a8cc4: am 40960743: am 2391e326: am d796a728: am 25ffc7ad: Accessibility: Read the time correctly in quick settings.
...
* commit 'ea5a8cc44fbfcb4da3edd3912dc199965d0ea797':
Accessibility: Read the time correctly in quick settings.
2015-07-29 23:36:17 +00:00
Dan Sandler
ea5a8cc44f
am 40960743: am 2391e326: am d796a728: am 25ffc7ad: Accessibility: Read the time correctly in quick settings.
...
* commit '409607431454354217cf19bc3e8df040bbee1c71':
Accessibility: Read the time correctly in quick settings.
2015-07-29 23:17:52 +00:00
Dianne Hackborn
0e3de6caca
Change MNC codename to just M.
...
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Dan Sandler
25ffc7ad95
Accessibility: Read the time correctly in quick settings.
...
The problem is that, for 12-hour locales, we cut the "a"
part of the time format out to show it in a separate
TextView so it can be animated independently of the actual
time. Unfortunately, while TTS is smart enough to pronounce
"1:15 AM" as /wʌn fɪftin eɪ ɛm/, "AM" on its own looks like
the English word "am" and is pronounced /æm/.
To fix this, a TextClock must be able to accept separate
formats for its content description than its presentation.
With this capability we can place the complete 12-hour time
format (including am/pm) in one of the views and suppress
the other one, so that the utterance creates an identical
experience to visual inspection: "1:15 AM" for all users.
Bug: 21718000
Change-Id: Ic9920d71ae4d4ad41ba86d7bd96f9a19b07e2108
2015-07-29 22:19:52 +00:00
Alan Viverette
e013384386
am 1a9097b5: am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
...
* commit '1a9097b5695759aa1e9e8fea563a7a569c0b345f':
Ensure maxHeight is at least 0 during measureChildHorizontal()
2015-07-29 22:05:04 +00:00
Alan Viverette
2c48d46d52
am f9ff3a27: am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
...
* commit 'f9ff3a27c6e6cdea7a0f05024de22bc2bad9312a':
Always distribute excess space in LinearLayout measurement
2015-07-29 22:04:56 +00:00
Alan Viverette
1a9097b569
am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
...
* commit 'd02e90f2c3917a983ed7f543efa30c05a34ee3ea':
Ensure maxHeight is at least 0 during measureChildHorizontal()
2015-07-29 20:55:07 +00:00
Alan Viverette
f9ff3a27c6
am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
...
* commit '91f2364738666674ad9dda7bc633d22ad5fb8680':
Always distribute excess space in LinearLayout measurement
2015-07-29 20:55:01 +00:00
Alan Viverette
47a74e7e2b
Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
2015-07-29 20:02:41 +00:00
Alan Viverette
7a40d21d89
Ensure maxHeight is at least 0 during measureChildHorizontal()
...
Bug: 22613599
Change-Id: I11f70ed1f7221874bef0f00f006e0ae294c4bdfa
2015-07-29 15:55:20 -04:00
Alan Viverette
4fabc02158
Always distribute excess space in LinearLayout measurement
...
Previously, excess space was added to existing measured dimensions.
This consistently resulted in incorrect allocation of excess space,
since the delta already included the height of any measured children
rather than just the excess space itself.
This CL ensures that excess space is always distributed according to the
layout weights.
Bug: 22810327
Change-Id: I482a553c469169769cc40ab3d88b4a44023f3eb5
2015-07-29 15:53:53 -04:00
Dan Sandler
912282e731
Fully support Icons in Notification actions.
...
RemoteViews now allows Icons as TextView compound
drawables in RemoteViews, but not yet as public API.
Bug: 22600607
Change-Id: I986a0ce3bede09746f0b121884184679f39a79f5
2015-07-29 14:18:38 -04:00
Mady Mellor
db31070269
am 74280180: am 3e120946: am 840b524e: am 9659297d: am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
...
* commit '74280180d10d0de8b83b6022bf72033aa93dd6e1':
Allow text selection handles to scroll horizontally
2015-07-28 18:47:02 +00:00
Mady Mellor
74280180d1
am 3e120946: am 840b524e: am 9659297d: am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
...
* commit '3e12094692427ec30d8c97644483aa9f5fe0e309':
Allow text selection handles to scroll horizontally
2015-07-28 00:57:47 +00:00
Mady Mellor
beb6e66817
Merge "Allow text selection handles to scroll horizontally" into mnc-dev
2015-07-28 00:16:49 +00:00
Mady Mellor
42390aab46
Allow text selection handles to scroll horizontally
...
When selecting text and expanding the selection, the handles snap
to the end (or start) of words. The handles don't snap until the
user has moved halfway through the word.
In horizontally scrolling text views, where some of the text is
cut off, the user cannot be halfway through the word, this causes
the selection to get stuck unless the user scrolls the view and then
continues selecting.
This CL does two things:
1) Checks if the user is close to the edge of the view when the
view can scroll horizontally, and places the cursor at next offset
if available.
2) Moves the code to check if handles are crossing into own method
this should be done each time the cursor is placed and avoids the
need to duplicate the check throughout updatePosition code.
Bug: 22657879
Change-Id: Ic14cb0994cd202a897bf6532f3832bb93ed49bfb
2015-07-24 13:08:42 -07:00
Andrei Stingaceanu
55f08bc3ff
am f8480f52: am 20295341: am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
...
* commit 'f8480f52507e0504a4f05763ffdaf668a067584e':
Disallow dragging text in extracted mode
2015-07-24 17:20:53 +00:00
Andrei Stingaceanu
f8480f5250
am 20295341: am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
...
* commit '2029534162b308c7dcb3ef73616ecd6c98b22c64':
Disallow dragging text in extracted mode
2015-07-24 16:07:41 +00:00
Andrei Stingaceanu
4579491003
Merge "Disallow dragging text in extracted mode" into mnc-dev
2015-07-24 14:35:48 +00:00
Svetoslav Ganov
a30cb27f2a
am cec9ac5c: am 71fa8e19: am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
...
* commit 'cec9ac5c8fdf0030efb0b60b1e3156bfc71a4d92':
Do not show normal permissions in sideloading UI
2015-07-24 05:12:36 +00:00
Alan Viverette
1b4acc8389
am 444883e9: am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
...
* commit '444883e9a1b7c38f11d631601a857da78f0b9bfa':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 05:10:58 +00:00
Svetoslav Ganov
cec9ac5c8f
am 71fa8e19: am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
...
* commit '71fa8e192c1e02f619509135fad8c2ba92871fea':
Do not show normal permissions in sideloading UI
2015-07-24 04:03:20 +00:00
Alan Viverette
444883e9a1
am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
...
* commit '35b1674a24354421701856a9c7b89abb008c911f':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 04:02:04 +00:00
Svetoslav Ganov
41a62e111d
Merge "Do not show normal permissions in sideloading UI" into mnc-dev
2015-07-23 00:27:16 +00:00
Svetoslav
a3f68ef2f6
Do not show normal permissions in sideloading UI
...
bug:22627493
Change-Id: I5bb900bb2cd68893c21d9e9b2c973d331d355b58
2015-07-22 17:05:05 -07:00
Alan Viverette
5b39ec8b40
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
...
Bug: 22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
2015-07-22 15:37:14 -04:00
Svetoslav
373ee3811f
am 2cf699c5: am aeb34f1a: am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit '2cf699c5314a89e02127cc7e2535cdb7ea385162':
Always create nodes for views backed by an adapter.
2015-07-21 21:43:10 +00:00
Svetoslav
2cf699c531
am aeb34f1a: am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit 'aeb34f1a516b9094a7552b8bb473756ab6079694':
Always create nodes for views backed by an adapter.
2015-07-21 19:53:51 +00:00
Svetoslav
81adda25b3
Merge "Always create nodes for views backed by an adapter." into mnc-dev
2015-07-21 19:01:19 +00:00
