OSDN Git Service
Chris Tate [Thu, 30 Jul 2015 17:45:01 +0000 (17:45 +0000)]
am
4de7b0ff: am
74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev
* commit '
4de7b0ffb06053183d991705b113fb9fe3c9075b':
Fix issues around process teardown after full-data restore
Chris Tate [Thu, 30 Jul 2015 17:37:19 +0000 (17:37 +0000)]
am
74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev
* commit '
74a0744ec19de54096638978bfe1eccfe2ed4e01':
Fix issues around process teardown after full-data restore
Chris Tate [Thu, 30 Jul 2015 17:28:07 +0000 (17:28 +0000)]
Merge "Fix issues around process teardown after full-data restore" into mnc-dev
Simranjit Kohli [Thu, 30 Jul 2015 17:24:43 +0000 (17:24 +0000)]
am
e5bf7064: am
964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
* commit '
e5bf70649499b3d3404d5df156ad38f106ce158a':
[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
Alan Viverette [Thu, 30 Jul 2015 17:18:44 +0000 (17:18 +0000)]
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
Simranjit Kohli [Thu, 30 Jul 2015 17:17:49 +0000 (17:17 +0000)]
am
964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
* commit '
964a41214d19f00e8420500ccaa29e0902933c7e':
[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
Alan Viverette [Thu, 30 Jul 2015 17:11:58 +0000 (17:11 +0000)]
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
Simranjit Kohli [Thu, 30 Jul 2015 17:09:44 +0000 (17:09 +0000)]
Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
Alan Viverette [Thu, 30 Jul 2015 17:02:45 +0000 (17:02 +0000)]
Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
Dan Sandler [Thu, 30 Jul 2015 16:54:03 +0000 (16:54 +0000)]
am
a93ed128: am
7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
* commit '
a93ed1288176e7f4789923f361e798bce6ef1618':
DateTimeView: don't assume you have an ApplicationContext.
Dan Sandler [Thu, 30 Jul 2015 16:45:51 +0000 (16:45 +0000)]
am
7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
* commit '
7bd8e6a8f2d0d200fd9a74b55469492cc02de6a4':
DateTimeView: don't assume you have an ApplicationContext.
Dan Sandler [Thu, 30 Jul 2015 15:46:10 +0000 (11:46 -0400)]
DateTimeView: don't assume you have an ApplicationContext.
Bug:
22840771
Change-Id: I3be6369936f90e9ce4e61a59ea81b0d3408a0f99
Alan Viverette [Thu, 30 Jul 2015 15:44:12 +0000 (11:44 -0400)]
Include non-zero dimension views in excess space calculation
Bug:
22840778
Change-Id: Iba44c59bbaa48f63b26f342e0510b4c421e8748b
Alan Viverette [Thu, 30 Jul 2015 15:16:38 +0000 (15:16 +0000)]
am
b3dba59f: am
c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
* commit '
b3dba59f3a52005c7326beefa5b277d4c7bef760':
Move padding from navigation and overflow icons to Toolbar
Alan Viverette [Thu, 30 Jul 2015 15:02:35 +0000 (15:02 +0000)]
am
c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
* commit '
c1d5b6c18c3b92708958daa998da2ec55adce00e':
Move padding from navigation and overflow icons to Toolbar
Alan Viverette [Thu, 30 Jul 2015 14:50:07 +0000 (14:50 +0000)]
Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
Alan Viverette [Thu, 30 Jul 2015 14:17:39 +0000 (10:17 -0400)]
Move padding from navigation and overflow icons to Toolbar
Also removes unused default_padding_material dimension.
Bug:
18482784
Change-Id: If294f61391bc76034feb8222d74f40d6b29857c5
Jim Miller [Thu, 30 Jul 2015 04:55:59 +0000 (04:55 +0000)]
am
be869b66: am
30c5da9c: Don\'t call cancel() when fingerprint auth fails
* commit '
be869b667142d3dc8723f19951b4d6ba2c055b24':
Don't call cancel() when fingerprint auth fails
Jim Miller [Thu, 30 Jul 2015 04:44:20 +0000 (04:44 +0000)]
am
30c5da9c: Don\'t call cancel() when fingerprint auth fails
* commit '
30c5da9cc20cc4b9ce820963c6f58d7826f46eaa':
Don't call cancel() when fingerprint auth fails
Jim Miller [Fri, 17 Jul 2015 21:11:56 +0000 (14:11 -0700)]
Don't call cancel() when fingerprint auth fails
KeyguardUpdateMonitor should not call cancel() when fingerprint
auth fails. The life cycle will continue until an actual error
occurs or the maximum number of retries is reached.
Fixes bug
22562277
Change-Id: I36291d025de9c049cc7f7924f692c8c21349bb7b
Daniel Sandler [Thu, 30 Jul 2015 03:25:12 +0000 (03:25 +0000)]
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.
Daniel Sandler [Thu, 30 Jul 2015 03:15:17 +0000 (03:15 +0000)]
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.
Daniel Sandler [Thu, 30 Jul 2015 02:57:06 +0000 (02:57 +0000)]
Merge changes from topic 'fix-media-notifications' into mnc-dev
* changes:
Fully support Icons in Notification actions.
Fix media notification action icons.
Simranjit Singh Kohli [Wed, 29 Jul 2015 23:34:49 +0000 (16:34 -0700)]
[Improve docs for AccountManager]
Currently, the docs for AccountManager are somewhat misleading and may
cause developer errors. To avoid them, we are properly documenting it.
Bug:
21924096
Change-Id: If775a54a09219b0f1623d2ff903085b9d12aa863
Paul Jensen [Thu, 30 Jul 2015 02:36:45 +0000 (02:36 +0000)]
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
Christopher Tate [Thu, 30 Jul 2015 02:23:58 +0000 (19:23 -0700)]
Fix issues around process teardown after full-data restore
The unified code path for cleanup was mistakenly looking at the
android:killAfterRestore manifest attribute even for full-data restore
operations. That attribute is only relevant for key/value payload
handling. We need to *always* kill after restore in the full-data
case because the app will otherwise be allowed to enter normal
component lifecycles without its correct Application / ContentProvider
state in force.
Bug
22704852
Change-Id: Ia63f985a35c28084c734389cfc49d3792173e5c7
Paul Jensen [Thu, 30 Jul 2015 02:20:49 +0000 (02:20 +0000)]
am
a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
* commit '
a991c66c12da30d0240ac6c98736edee93d95977':
Fix missing onLost NetworkCallbacks when network loses capability
Paul Jensen [Thu, 30 Jul 2015 02:10:50 +0000 (02:10 +0000)]
Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
Dianne Hackborn [Thu, 30 Jul 2015 02:00:35 +0000 (02:00 +0000)]
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...
Dianne Hackborn [Thu, 30 Jul 2015 01:44:38 +0000 (01:44 +0000)]
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...
Dianne Hackborn [Thu, 30 Jul 2015 01:32:09 +0000 (01:32 +0000)]
Merge "More maybe fix issue #
22765972: Binder transactions running out..." into mnc-dev
Dianne Hackborn [Thu, 30 Jul 2015 00:58:33 +0000 (17:58 -0700)]
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
Jason Monk [Thu, 30 Jul 2015 00:53:08 +0000 (00:53 +0000)]
am
41402867: am
beb3185f: Merge "Fix touch target for settings icon" into mnc-dev
* commit '
414028675297b33d9899ccab2f04e908b7aa8c1d':
Fix touch target for settings icon
Jorim Jaggi [Thu, 30 Jul 2015 00:53:04 +0000 (00:53 +0000)]
am
8e43c3e7: am
26aa04c3: Fix state weirdness in the panel
* commit '
8e43c3e76f8edb9408dd49d673f76044e335ecd6':
Fix state weirdness in the panel
Jason Monk [Thu, 30 Jul 2015 00:36:29 +0000 (00:36 +0000)]
am
beb3185f: Merge "Fix touch target for settings icon" into mnc-dev
* commit '
beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0':
Fix touch target for settings icon
Jorim Jaggi [Thu, 30 Jul 2015 00:36:25 +0000 (00:36 +0000)]
am
26aa04c3: Fix state weirdness in the panel
* commit '
26aa04c3c4d16ab7bf47d414fac697721e5843cd':
Fix state weirdness in the panel
Jason Monk [Thu, 30 Jul 2015 00:32:17 +0000 (00:32 +0000)]
Merge "Fix touch target for settings icon" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 21:52:22 +0000 (14:52 -0700)]
Fix state weirdness in the panel
When QS was open while the we started with expansion, we
immediately notified about expansion finsihed again, which led to all
kinds of weird states. The change that introduced these bugs was to
fix another bug in which onExpandingFinished was not call. Make sure
to call in exactly that case and no other case to not risk
regressions.
Bug:
22806817
Bug:
22807359
Bug:
22807372
Change-Id: Id7daf37ef4a772f724971bf79c61084ff4279f31
Jorim Jaggi [Thu, 30 Jul 2015 00:05:46 +0000 (00:05 +0000)]
Wale Ogunwale [Thu, 30 Jul 2015 00:05:41 +0000 (00:05 +0000)]
am
70e67733: am
e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev
* commit '
70e67733e0fafd5cf802ad9f3641d381ee724798':
Fixed out of bounds exception while handling app crash
Jorim Jaggi [Thu, 30 Jul 2015 00:05:36 +0000 (00:05 +0000)]
am
0657f9f3: am
4a0e791c: Workaround View.post issues to fix runtime crash
* commit '
0657f9f3718289aeee590d9633bcbd863829f109':
Workaround View.post issues to fix runtime crash
Jorim Jaggi [Wed, 29 Jul 2015 23:56:06 +0000 (23:56 +0000)]
Wale Ogunwale [Wed, 29 Jul 2015 23:56:01 +0000 (23:56 +0000)]
am
e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev
* commit '
e8246ff7443ec0d1acd7f3637c28fa066779638b':
Fixed out of bounds exception while handling app crash
Jorim Jaggi [Wed, 29 Jul 2015 23:55:56 +0000 (23:55 +0000)]
am
4a0e791c: Workaround View.post issues to fix runtime crash
* commit '
4a0e791cc0a71df2b0c6bae6e92a5f2100fb5841':
Workaround View.post issues to fix runtime crash
Jorim Jaggi [Wed, 29 Jul 2015 22:17:23 +0000 (15:17 -0700)]
Fix doze mode
Make sure to reset the keyguard drawn state in the correct place,
so we don't return early in finishKeyguardDrawn() because
mKeyguardDrawComplete is still true.
Bug:
22808662
Change-Id: I7e18e91c412c6cac7fe253837949602f76b7f270
Wale Ogunwale [Wed, 29 Jul 2015 23:41:08 +0000 (23:41 +0000)]
Merge "Fixed out of bounds exception while handling app crash" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 22:46:29 +0000 (15:46 -0700)]
Workaround View.post issues to fix runtime crash
Using View.post was really dangerous because when the view wasn't
attached, it got posted on the run queue of the *calling* thread.
However, that run queue was never executed until power down, and
then it was executed from the PowerManagerService thread, because
that was the calling thread when we posted it. Work around this by
using a solid Handler.
Bug:
22820787
Change-Id: Id60e49e859558993256fae0403236f2e4b6f1075
Wale Ogunwale [Wed, 29 Jul 2015 23:01:50 +0000 (16:01 -0700)]
Fixed out of bounds exception while handling app crash
The current stack we are proccessing can be deleted as part of
the clean-up process, so the size of the stack list is reduced
by one.
Bug:
22822743
Change-Id: I6a6af5d8d811e231f345f01dd2aa4a61510c8d2b
Billy Lau [Wed, 29 Jul 2015 23:02:05 +0000 (23:02 +0000)]
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)
Ji Yang [Wed, 29 Jul 2015 23:02:01 +0000 (23:02 +0000)]
am
f520f022: am
499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
* commit '
f520f022db3e78eaefade13352e01c7f398a81fe':
Add API to let carrier app send SMS without auto perisisting.
Dan Sandler [Wed, 29 Jul 2015 22:47:29 +0000 (22:47 +0000)]
am
d796a728: am
25ffc7ad: Accessibility: Read the time correctly in quick settings.
* commit '
d796a728bc7c1ffa3af53ef040e46401dce667f5':
Accessibility: Read the time correctly in quick settings.
Billy Lau [Wed, 29 Jul 2015 22:46:20 +0000 (22:46 +0000)]
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)
Ji Yang [Wed, 29 Jul 2015 22:46:16 +0000 (22:46 +0000)]
am
499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
* commit '
499f084d9e7bb3323ed447b16f548bad9b886aa7':
Add API to let carrier app send SMS without auto perisisting.
Billy Lau [Wed, 29 Jul 2015 22:42:27 +0000 (22:42 +0000)]
Merge "Bug:
21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
Ji Yang [Wed, 29 Jul 2015 22:35:30 +0000 (22:35 +0000)]
Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
Dan Sandler [Wed, 29 Jul 2015 22:32:15 +0000 (22:32 +0000)]
am
25ffc7ad: Accessibility: Read the time correctly in quick settings.
* commit '
25ffc7ad950d9b2857abe9cb66ed53aed7a18ecf':
Accessibility: Read the time correctly in quick settings.
Billy Lau [Fri, 17 Jul 2015 23:26:58 +0000 (00:26 +0100)]
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
Robert Greenwalt [Wed, 29 Jul 2015 22:21:13 +0000 (22:21 +0000)]
am
f8808db0: am
771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit '
f8808db0c107c748ba84b097c97de13ec33fd8fa':
Revert "DO NOT MERGE Enhance local log."
Svetoslav Ganov [Wed, 29 Jul 2015 22:21:08 +0000 (22:21 +0000)]
am
a4375293: am
393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev
* commit '
a43752934f76316b60a839b2526a23e40714bd70':
Default grants: handle update system packages
Dan Sandler [Thu, 11 Jun 2015 13:17:07 +0000 (09:17 -0400)]
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
Robert Greenwalt [Wed, 29 Jul 2015 22:08:15 +0000 (22:08 +0000)]
am
771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit '
771d210ab2d0df9d6748eb56e3f7250377df1fc4':
Revert "DO NOT MERGE Enhance local log."
Svetoslav Ganov [Wed, 29 Jul 2015 22:08:11 +0000 (22:08 +0000)]
am
393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev
* commit '
393c7fb2c67e7fc9dfab710a52313f9b55aaa57c':
Default grants: handle update system packages
Robert Greenwalt [Wed, 29 Jul 2015 22:00:40 +0000 (22:00 +0000)]
Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
Svetoslav Ganov [Wed, 29 Jul 2015 21:54:13 +0000 (21:54 +0000)]
Merge "Default grants: handle update system packages" into mnc-dev
Adrian Roos [Wed, 29 Jul 2015 21:52:08 +0000 (21:52 +0000)]
am
f65209d8: am
e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit '
f65209d8082ca1251996021ddf0b227f0c08f56f':
Fix pattern lock for accessibility
Adrian Roos [Wed, 29 Jul 2015 21:37:08 +0000 (21:37 +0000)]
am
e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit '
e2cd84196e1266200f906b5d721640217fc2e6f9':
Fix pattern lock for accessibility
Adrian Roos [Wed, 29 Jul 2015 21:23:25 +0000 (21:23 +0000)]
Merge "Fix pattern lock for accessibility" into mnc-dev
Adrian Roos [Mon, 27 Jul 2015 20:49:53 +0000 (13:49 -0700)]
Fix pattern lock for accessibility
- remove the content description in Keyguard
- only show virtual views when pattern is in progress
- add a content description when the pattern is not in progress
Bug:
22646748
Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
Alan Viverette [Wed, 29 Jul 2015 21:11:59 +0000 (21:11 +0000)]
am
fa37ee81: am
93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit '
fa37ee81ed80f0dc6eeeed2d9a89610dd967229a':
DO NOT MERGE: Don't backup night mode setting
Adrian Roos [Wed, 29 Jul 2015 21:11:55 +0000 (21:11 +0000)]
am
8e9b33f8: am
726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
* commit '
8e9b33f8fde3d96a7ced9817ce9357da4f1a7cff':
Fix and deprecate lock pattern related settings
Robert Greenwalt [Wed, 29 Jul 2015 19:12:01 +0000 (19:12 +0000)]
Revert "DO NOT MERGE Enhance local log."
This reverts commit
dd6f8441292d30cc51c1e32bb27fab8dfb791f90.
bug:
22632129
Change-Id: Ibd4b9c35b66cb7d877085bc010fde45a682ba34f
Svetoslav [Wed, 29 Jul 2015 21:00:18 +0000 (14:00 -0700)]
Default grants: handle update system packages
If there is an app on the system image that gets default
grants but it is updated with a version that does not use
all permissions the version on the system image does, we
would wrongly try to grant a permission to the updated app
that it does not request and crash as a result. Now we
default grant permission that are requested by the system
version of the app regardless if it is updated but only if
the system app is not updated or the update also uses these
permissions.
bug:
22800767
Change-Id: Ic22b62ba4976367420a56bdadc8e3824b0b9104f
Alan Viverette [Wed, 29 Jul 2015 20:58:38 +0000 (20:58 +0000)]
am
93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit '
93184eef410da6bb958d22e1dc90f3fddabc9369':
DO NOT MERGE: Don't backup night mode setting
Adrian Roos [Wed, 29 Jul 2015 20:58:32 +0000 (20:58 +0000)]
am
726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
* commit '
726d47b7716807f740ceea6ea71c46b20ecb8ba7':
Fix and deprecate lock pattern related settings
Alan Viverette [Wed, 29 Jul 2015 20:46:08 +0000 (20:46 +0000)]
Merge "DO NOT MERGE: Don't backup night mode setting" into mnc-dev
Adrian Roos [Wed, 29 Jul 2015 20:39:27 +0000 (20:39 +0000)]
Merge "Fix and deprecate lock pattern related settings" into mnc-dev
Ji Yang [Thu, 23 Jul 2015 17:16:07 +0000 (10:16 -0700)]
Add API to let carrier app send SMS without auto perisisting.
Bug:
22773702
Change-Id: I976a8268ce95fe9fc5bb046ce744a1cddefc8eeb
Alan Viverette [Wed, 29 Jul 2015 20:26:33 +0000 (20:26 +0000)]
am
4c06870d: am
47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '
4c06870db615acbf50008e0bc964e15a1c36aa22':
Ensure maxHeight is at least 0 during measureChildHorizontal()
Alan Viverette [Wed, 29 Jul 2015 20:26:28 +0000 (20:26 +0000)]
am
1c8107dd: am
5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
* commit '
1c8107dd89c8424c8fad9e341dc43be04e1a62ae':
Always distribute excess space in LinearLayout measurement
Jeff Sharkey [Wed, 29 Jul 2015 20:26:21 +0000 (20:26 +0000)]
am
439e2db3: am
b86048da: Merge "Always return content Uri for downloads." into mnc-dev
* commit '
439e2db3f38f0d304757651b2d9291ba1c93f2d2':
Always return content Uri for downloads.
Alan Viverette [Wed, 29 Jul 2015 20:22:03 +0000 (16:22 -0400)]
DO NOT MERGE: Don't backup night mode setting
Bug:
22824325
Change-Id: I7a244f416e1aa258735eea09858e3c202e8c8945
Raph Levien [Wed, 29 Jul 2015 20:11:20 +0000 (20:11 +0000)]
am
d9074d1e: am
c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
* commit '
d9074d1eec5be644168dc17133f5bd753fedb614':
Release text when finishing StaticLayout.Builder
Alan Viverette [Wed, 29 Jul 2015 20:10:21 +0000 (20:10 +0000)]
am
47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '
47a74e7e2b45d9ec462f47f6741c381c478b4156':
Ensure maxHeight is at least 0 during measureChildHorizontal()
Alan Viverette [Wed, 29 Jul 2015 20:10:16 +0000 (20:10 +0000)]
am
5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
* commit '
5c380efa2c0bf3617aedbb9270fa02cce59c7935':
Always distribute excess space in LinearLayout measurement
Jeff Sharkey [Wed, 29 Jul 2015 20:10:09 +0000 (20:10 +0000)]
am
b86048da: Merge "Always return content Uri for downloads." into mnc-dev
* commit '
b86048dab3df3e4a8f05de170b38c189243de898':
Always return content Uri for downloads.
Jason Monk [Wed, 29 Jul 2015 20:07:39 +0000 (16:07 -0400)]
Fix touch target for settings icon
Bug:
22808656
Change-Id: I92b77b30bfeadc80d060dab67a51d5fcd96268af
Alan Viverette [Wed, 29 Jul 2015 20:02:41 +0000 (20:02 +0000)]
Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
Alan Viverette [Wed, 29 Jul 2015 20:01:52 +0000 (20:01 +0000)]
Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
Jeff Sharkey [Wed, 29 Jul 2015 19:59:36 +0000 (19:59 +0000)]
Merge "Always return content Uri for downloads." into mnc-dev
Raph Levien [Wed, 29 Jul 2015 19:58:30 +0000 (19:58 +0000)]
am
c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
* commit '
c3cc344d12ff4a952af8842fab71ef2f6df5e340':
Release text when finishing StaticLayout.Builder
Alan Viverette [Wed, 29 Jul 2015 19:55:20 +0000 (15:55 -0400)]
Ensure maxHeight is at least 0 during measureChildHorizontal()
Bug:
22613599
Change-Id: I11f70ed1f7221874bef0f00f006e0ae294c4bdfa
Alan Viverette [Wed, 29 Jul 2015 19:53:53 +0000 (15:53 -0400)]
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
Raph Levien [Wed, 29 Jul 2015 19:44:21 +0000 (19:44 +0000)]
Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
Wale Ogunwale [Wed, 29 Jul 2015 19:38:06 +0000 (19:38 +0000)]
am
f8fa9f23: am
25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev
* commit '
f8fa9f23cf47876e00ec60af4b84cda72b58993d':
Added stack id to TaskRecord dump.
Roshan Pius [Wed, 29 Jul 2015 19:38:01 +0000 (19:38 +0000)]
am
5d573ed8: am
944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit '
5d573ed8711fcb3af651944631faed386c25184f':
Add a command to register SIM Phone account.
Raph Levien [Wed, 29 Jul 2015 19:34:13 +0000 (12:34 -0700)]
Release text when finishing StaticLayout.Builder
DynamicLayout reuses a StaticLayout.Builder object to avoid having to
allocate. There is a "finish" method that releases any expensive
internal state of the builder object, but it didn't release a
reference to the text object (which in turn may contain references to
lots of other things, especially if it's a Spannable).
This patch releases the text, as well as a few other arrays, at time
of finish.
Bug:
22822416
Change-Id: Icc8b6cd41a9a2d11689df7bd1b9f524c6524f706
Wale Ogunwale [Wed, 29 Jul 2015 19:23:48 +0000 (19:23 +0000)]
am
25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev
* commit '
25782ef834514d6e24a0f8aaa463683d1a7f95f3':
Added stack id to TaskRecord dump.
Roshan Pius [Wed, 29 Jul 2015 19:14:40 +0000 (19:14 +0000)]
am
944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit '
944b63624b40c96f4a31af750e1678c0b9c88ad1':
Add a command to register SIM Phone account.
Wale Ogunwale [Wed, 29 Jul 2015 19:11:44 +0000 (19:11 +0000)]
Merge "Added stack id to TaskRecord dump." into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 19:00:23 +0000 (19:00 +0000)]
am
4c927895: am
75d958c4: Merge "Disable launching assist during setup" into mnc-dev
* commit '
4c9278950363fb14d848b7a67dc6dca13854dce8':
Disable launching assist during setup