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
Alan Viverette
82c14e6865
am 92360585: am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
...
* commit '92360585abfb96736f5b55b5410425eb4ad7669c':
Include non-zero dimension views in excess space calculation
2015-07-30 17:18:44 +00:00
Alan Viverette
92360585ab
am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
...
* commit '559daf7a749514065c6c482503a86a528addc985':
Include non-zero dimension views in excess space calculation
2015-07-30 17:11:58 +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
06e544f0be
am a93ed128: am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
...
* commit 'a93ed1288176e7f4789923f361e798bce6ef1618':
DateTimeView: don't assume you have an ApplicationContext.
2015-07-30 16:54:03 +00:00
Dan Sandler
a93ed12881
am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
...
* commit '7bd8e6a8f2d0d200fd9a74b55469492cc02de6a4':
DateTimeView: don't assume you have an ApplicationContext.
2015-07-30 16:45:51 +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
Derek Sollenberger
897863baeb
Merge "Support High Contrast Text for all canvas types"
2015-07-30 13:15:14 +00: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
829359163d
am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
...
* commit '033fe243a75f6e5e7ba8f75bd829bddaf213c7c2':
Fully support Icons in Notification actions.
Fix media notification action icons.
2015-07-30 03:25:12 +00:00
Daniel Sandler
033fe243a7
am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
...
* commit 'bbe1682b1652c37b66609676e5829517279ff141':
Fully support Icons in Notification actions.
Fix media notification action icons.
2015-07-30 03:15:17 +00:00
Paul Jensen
722113aa5f
am 917b275d: am 06287d1c: am 9a2314b0: am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit '917b275d6b54b08edb6326512d7e48a02163e730':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 03:12:21 +00:00
Paul Jensen
917b275d6b
am 06287d1c: am 9a2314b0: am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit '06287d1c1859c9eafb0b4e195e57215a7e9af59c':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 02:57:30 +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
Dianne Hackborn
24982dc19e
am 9820374a: am f228f455: am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972 : Binder transactions running out..." into mnc-dev
...
* commit '9820374a5facbcde9f49c8cdf10cfd8ab83f0599':
More maybe fix issue #22765972 : Binder transactions running out...
2015-07-30 02:40:07 +00:00
Paul Jensen
9a2314b0bc
am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit '682fd6aedea87e345f033b489ef9f6008bd19c30':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 02:36:45 +00:00
Dianne Hackborn
9820374a5f
am f228f455: am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972 : Binder transactions running out..." into mnc-dev
...
* commit 'f228f455ea7fbec00f731773e5a51f55e9eb792f':
More maybe fix issue #22765972 : Binder transactions running out...
2015-07-30 02:26:51 +00:00
Paul Jensen
682fd6aede
am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit 'a991c66c12da30d0240ac6c98736edee93d95977':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 02:20:49 +00:00
Paul Jensen
a991c66c12
Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
2015-07-30 02:10:50 +00:00
Dianne Hackborn
17043db8e9
am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972 : Binder transactions running out..." into mnc-dev
...
* commit '69e7fa8a521a402b4a80aafbca203f66b3323123':
More maybe fix issue #22765972 : Binder transactions running out...
2015-07-30 02:00:35 +00:00
Dianne Hackborn
69e7fa8a52
am 8d3a67a8: Merge "More maybe fix issue #22765972 : Binder transactions running out..." into mnc-dev
...
* commit '8d3a67a8d475b43cbac50a2a186a19f4a29c7892':
More maybe fix issue #22765972 : Binder transactions running out...
2015-07-30 01:44:38 +00:00
Dianne Hackborn
8d3a67a8d4
Merge "More maybe fix issue #22765972 : Binder transactions running out..." into mnc-dev
2015-07-30 01:32:09 +00:00
Dianne Hackborn
6b42bc0e21
More maybe fix issue #22765972 : Binder transactions running out...
...
...of address space causing package manager to fail
Make sure to flush binder commands when done with an async task.
Change-Id: I9f171add7051587ab854226b97a12c7e1844ad5d
2015-07-29 17:58:33 -07:00
Billy Lau
a91dccdf57
am bafb5130: am ee2ee0f9: am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
...
* commit 'bafb51305731fd837b12878fffabe8885239ea10':
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
2015-07-29 23:51:47 +00:00
Billy Lau
bafb513057
am ee2ee0f9: am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
...
* commit 'ee2ee0f92d6b18c9e09b32d6ceba9fe22db0565d':
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
2015-07-29 23:36:20 +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
Billy Lau
be6bfb4c91
am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
...
* commit '83749ac948c40a3c302f00bef47ef0b4bba96ae7':
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
2015-07-29 23:02:05 +00:00
Robert Greenwalt
d230fd8b79
am 5d19d620: am 4799a9e0: am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
...
* commit '5d19d62034d09c5c54f2fbb56eb78ad40f5c34df':
Revert "DO NOT MERGE Enhance local log."
2015-07-29 22:47:39 +00:00
Dan Sandler
2391e3262e
am d796a728: am 25ffc7ad: Accessibility: Read the time correctly in quick settings.
...
* commit 'd796a728bc7c1ffa3af53ef040e46401dce667f5':
Accessibility: Read the time correctly in quick settings.
2015-07-29 22:47:29 +00:00
Billy Lau
83749ac948
am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
...
* commit 'a6706627a9bf749cc591605272810e03983a9eea':
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
2015-07-29 22:46:20 +00:00
Billy Lau
a6706627a9
Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
2015-07-29 22:42:27 +00:00
Adrian Roos
0d7c7c5f85
am 38ea7978: am bb8326d0: am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
...
* commit '38ea797860960477bce5d3e73b7d351f436d7090':
Fix pattern lock for accessibility
2015-07-29 22:33:57 +00:00
Dan Sandler
d796a728bc
am 25ffc7ad: Accessibility: Read the time correctly in quick settings.
...
* commit '25ffc7ad950d9b2857abe9cb66ed53aed7a18ecf':
Accessibility: Read the time correctly in quick settings.
2015-07-29 22:32:15 +00:00
Billy Lau
6ad2d66072
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check
...
changes)
AppOpsManager:
Changed the default operating mode for WRITE_SETTINGS to MODE_DEFAULT from
MODE_ALLOWED.
packages/SettingsProvider:
We no longer do static permission checks for WRITE_SETTINGS in early checks and
defer that to app op when MODE_DEFAULT is returned. For some operations,
checking against WRITE_SECURE_SETTINGS is sufficient.
ActivityManagerService & PowerManagerService:
Incorporated app op checks and handled the MODE_DEFAULT case.
provider/Settings:
Added helper function to do checks on whether app ops protected operations
can be performed by a caller. This includes checks for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW.
Also added a public API (with javadocs) for apps to query if they can modify
system settings.
Changed the javadocs description for ACTION_MANAGE_WRITE_SETTINGS and
ACTION_MANAGE_OVERLAY_PERMISSION.
Added public API (with javadocs) for apps to query whether they can draw overlays or not,
and also javadocs description on how to use that check.
Change-Id: I7b651fe8af836c2074defdbd6acfec3f32acdbe9
2015-07-29 23:21:26 +01:00
Robert Greenwalt
4799a9e06e
am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
...
* commit 'f8808db0c107c748ba84b097c97de13ec33fd8fa':
Revert "DO NOT MERGE Enhance local log."
2015-07-29 22:21:13 +00: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
Adrian Roos
38ea797860
am bb8326d0: am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
...
* commit 'bb8326d0cc1a15d7f78978d28646708eac107a2d':
Fix pattern lock for accessibility
2015-07-29 22:16:26 +00:00
Robert Greenwalt
f8808db0c1
am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
...
* commit '771d210ab2d0df9d6748eb56e3f7250377df1fc4':
Revert "DO NOT MERGE Enhance local log."
2015-07-29 22:08:15 +00:00
Adrian Roos
6086a25eb7
am 5334b265: am aeda904f: am 4371922d: am 8e9b33f8: am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
...
* commit '5334b265af71a31b0cf428b97b437ac040c067dc':
Fix and deprecate lock pattern related settings
2015-07-29 22:05:15 +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
Jeff Sharkey
dea786bf7c
am fb4a3a99: am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev
...
* commit 'fb4a3a99da3b28e1873feecb5c074aa537239dd6':
Always return content Uri for downloads.
2015-07-29 22:04:49 +00:00
Raph Levien
27630ec94d
am bd0db6b4: am 8fde12eb: am c248a6cf: am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
...
* commit 'bd0db6b451fd3182fbc73157af4021b84e8177e8':
Release text when finishing StaticLayout.Builder
2015-07-29 22:04:40 +00:00
Svetoslav Ganov
fdf59bf82f
am c875ad14: am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev
...
* commit 'c875ad14ddc09d0d3a3bde58f71845123110f9f2':
Remove dependencies on the package installer's package name
2015-07-29 22:03:19 +00:00