Alan Viverette
840855c021
Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
2014-09-19 19:11:47 +00:00
Paul Soulos
628cb74d8a
Fixes typo in Intent documentation
...
bug: 17583712
Change-Id: I37c77644213417751f8261098af44096aef51b14
2014-09-19 19:10:04 +00:00
Nancy Chen
3fab08eef6
Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
2014-09-19 19:08:29 +00:00
Adam Lesinski
67ab8fa5bc
am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
...
* commit '863b1a90e0b52683d3ed82af54431d247be1cab1':
Fix backwards compat problem with AAPT public attrs
2014-09-19 18:43:22 +00:00
Jason Monk
f6b46cb8b1
Fix crash in PacManager
...
The PacManager would clear the pac url by setting it to null, however
everywhere else, pac url is cleared to Uri.EMPTY. This sometimes leads
to an NPE when PAC is set and cleared rapidly and take down the whole
framework.
Bug: 17581527
Change-Id: I84ce215f4f6a8a7e804372fc0a1e20ac609a21f1
2014-09-19 18:34:32 +00:00
Adam Lesinski
e2e58ef960
am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
...
* commit '19f9d54fec2659769748d72972b4bed6a033571a':
Fix backwards compat problem with AAPT public attrs
2014-09-19 18:29:48 +00:00
Selim Cinek
a0fad3ba06
Optimized and improved the status bar performance a lot
...
Instead of clearing the Statusbarwindow buffer in the beginning
we now draw the scrim with mode SRC and therefore a whole screen
of overdraw is saved!
Bug: 17287256
Change-Id: I29f14a2c3d4cb087c422ae6f486d23d7f8ec173b
2014-09-19 18:25:56 +00:00
Adam Lesinski
b6812b64c4
Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
2014-09-19 18:19:58 +00:00
Jeff Sharkey
bfed9f34c0
Fix bugs when system apps reclaim permissions.
...
Recently we started letting system apps always take precedence over
third-party apps when defining permissions. This change fixes that
logic to claim the permission immediately, instead of delaying until
after the next reboot. (Permissions are always reevaluated after
each install.)
We also tighten the constraints slightly to prevent two system
apps from fighting over a permission definition; the first system
app to claim the permission wins.
Bug: 17526617
Change-Id: I49686407f5e99322bc511795c653c5d702becd9d
2014-09-19 11:11:25 -07:00
Chris Craik
a706efacf8
am 4f58dcf5: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
...
* commit '4f58dcf55a2faa95b99f69c3a1ccdbcd2c060387':
Hide other color filter mutability
2014-09-19 18:04:33 +00:00
Nancy Chen
f4cf77c5dc
Add constructor for DisconnectCause that does not require a tone.
...
In order to create a DisconnectCause with a label/description that does
not require specifying a tone.
Bug: 17486242
Change-Id: If82605ff20fc9f53ed41b49e12575424c6efc2b6
2014-09-19 11:01:45 -07:00
Chris Craik
c8fc7270b9
am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
...
* commit 'e99510a44685e4aff983eca9e432f8edbdfbd8fd':
Hide other color filter mutability
2014-09-19 17:54:42 +00:00
Adam Powell
10ed4988bd
am b057639f: am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev
...
* commit 'b057639fd2b03a54902ab2c1f863216adff0d78a':
Make panel menu windows respect elevation
2014-09-19 17:51:53 +00:00
Chris Craik
ddc5e5f1c6
Merge "Hide other color filter mutability" into lmp-dev
2014-09-19 17:42:22 +00:00
John Reck
28dc2d9d13
am a154d76e: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev
...
* commit 'a154d76ed42a8156cf7c4e4a2c3342fb26c3819d':
glFinish to flush deletes
2014-09-19 17:40:01 +00:00
Jason Monk
eb6f2c9988
am 87c6828e: am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
...
* commit '87c6828eebca8f1149d2902890638127714e0270':
QS: Fix accessibility announce for dual tiles
2014-09-19 17:39:56 +00:00
Amit Mahajan
c72ca78ff3
am b8055865: am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev
...
* commit 'b8055865552508d2c5c17ddaf753f731ee4435dc':
Handling service number convert while roaming.
2014-09-19 17:39:52 +00:00
Adam Powell
7d507a9a17
am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev
...
* commit 'e58c95786dba4bd356742a0127b7aacb78184440':
Make panel menu windows respect elevation
2014-09-19 17:38:16 +00:00
John Reck
dd4593feb8
am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev
...
* commit '340ccfe0fc65803b56d68c2b067a5198c14d0f6f':
glFinish to flush deletes
2014-09-19 17:26:49 +00:00
Jason Monk
39011698dd
am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
...
* commit '8598377bc58cb62c179c0ae5cd380842604b041b':
QS: Fix accessibility announce for dual tiles
2014-09-19 17:26:45 +00:00
Amit Mahajan
d422df7928
am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev
...
* commit '9391ee9e8b9f0daab2fd7a42189e3deac96c0e48':
Handling service number convert while roaming.
2014-09-19 17:26:41 +00:00
Adam Powell
2b2f6729b8
Merge "Make panel menu windows respect elevation" into lmp-dev
2014-09-19 17:25:34 +00:00
Alan Viverette
0158b82262
Fix action bar title size consistency
...
BUG: 17582193
Change-Id: I7dfe9229361dcd52893fd96e1e8f9a006d7ffad3
2014-09-19 10:23:34 -07:00
John Reck
6cc6219f6f
Merge "glFinish to flush deletes" into lmp-dev
2014-09-19 17:22:17 +00:00
Alan Viverette
bb696dcca9
Fix radial time picker inner circle (1-12) selections
...
Result of a poorly collapsed set of if block conditionals.
BUG: 17580782
Change-Id: I7f7e5038f943d1f49e1541acfa282479cb2505ea
2014-09-19 10:20:45 -07:00
Jason Monk
33d326d133
Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
2014-09-19 17:19:40 +00:00
Amit Mahajan
df22548d3a
Merge "Handling service number convert while roaming." into lmp-dev
2014-09-19 17:12:33 +00:00
John Reck
4ced2620b7
glFinish to flush deletes
...
Bug: 17479800
Change-Id: I4d4a3eeda510e037f806052025184f3cde18c847
2014-09-19 10:10:19 -07:00
Christoph Studer
3fe453d3e8
am 6ea89f54: am 82485096: Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev
...
* commit '6ea89f5423ee7ea082252d6607447715fadf2287':
Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()
2014-09-19 17:06:11 +00:00
Jeff Sharkey
1742ff5f9a
am 3bbec99f: am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev
...
* commit '3bbec99fa2d9bc1d01d80c4a46fc5e1daf654f50':
Only revoke ownerless grants when unprivileged.
2014-09-19 16:57:00 +00:00
Christoph Studer
4a7e846353
am 82485096: Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev
...
* commit '82485096da29e452a7e066c949b609c2f72e063d':
Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()
2014-09-19 16:54:27 +00:00
Christoph Studer
bc46c83073
Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev
2014-09-19 16:43:47 +00:00
Jeff Sharkey
976a3be200
am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev
...
* commit 'e6c4fb00791653ab12302b16dedb2e9696bd0103':
Only revoke ownerless grants when unprivileged.
2014-09-19 16:41:10 +00:00
Alan Viverette
26eac73cf1
am 09b87b5b: am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev
...
* commit '09b87b5b53ddb4fb314f8415318543ee62214933':
Delete file containing removed attributes and styles
2014-09-19 16:41:05 +00:00
Jeff Sharkey
c1cdd4bda3
Merge "Only revoke ownerless grants when unprivileged." into lmp-dev
2014-09-19 16:32:52 +00:00
John Spurlock
79fcf4c0b1
am da676b8b: am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev
...
* commit 'da676b8b552da886b7debcca8dfdd6cc95e14dcd':
When dozing, re-enable falsing threshold and log events.
2014-09-19 16:27:55 +00:00
Alan Viverette
c973202559
am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev
...
* commit '9cfe1e3c2785b78da86f450b9240b743842e65c2':
Delete file containing removed attributes and styles
2014-09-19 16:27:27 +00:00
Alan Viverette
e68bc7ab73
Merge "Delete file containing removed attributes and styles" into lmp-dev
2014-09-19 16:21:01 +00:00
Amith Yamasani
8fd6557a0b
am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
...
* commit 'e1206a349fd9ddc5868451c8a6b864af0a1dc11e':
Allow primary user profile owner to set device restrictions
2014-09-19 16:18:49 +00:00
John Spurlock
e00e69c583
am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev
...
* commit '933e841121f91329bd4273cbffe1ed510db76314':
When dozing, re-enable falsing threshold and log events.
2014-09-19 16:16:48 +00:00
Jeff Sharkey
29b2516012
Only revoke ownerless grants when unprivileged.
...
Recently we relaxed revokeUriPermission() to allow apps to revoke
Uri permissions that had been granted to them, but this uncovered
bugs in apps that had been relying on the previous no-op behavior.
To mitigate this, only revoke ownerless Uri permissions when in the
unprivileged state; an active owner indicates that another component
of the calling app still needs the permission.
Bug: 17554268
Change-Id: Icc412933b29041ffb699d20136a623440ecc71ec
2014-09-19 09:15:45 -07:00
Baligh Uddin
fd02e23189
am 67ea9443: (-s ours) am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '67ea944373bdbde684a77fd856e6902e0a4fac1c':
Import translations. DO NOT MERGE
2014-09-19 16:05:54 +00:00
George Mount
30531c8345
am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev
...
* commit '00877d68937f3f17cceff222b052d2b16f9b7d87':
Fix exception when fragment container has no View.
2014-09-19 16:05:50 +00:00
George Mount
73a92d2633
am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev
...
* commit 'af2f8cda5f950b7685892398e38f0ef270faf831':
Fix NPE when shared element listener is null.
2014-09-19 16:05:46 +00:00
John Spurlock
71c8a70eff
Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev
2014-09-19 16:04:36 +00:00
Amith Yamasani
70a2afd10e
am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
...
* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
Allow primary user profile owner to set device restrictions
2014-09-19 16:02:59 +00:00
Chris Craik
f559326b18
Hide other color filter mutability
...
bug:17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
2014-09-19 08:54:09 -07:00
Baligh Uddin
778f5c92aa
am fdb8d347: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'fdb8d3479d153e226d0d0d0d64d183d374e9acf8':
Import translations. DO NOT MERGE
2014-09-19 15:54:06 +00:00
Chris Craik
a3af75cf5c
am 5db573c7: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev
...
* commit '5db573c733367bba7fd05d99632a5f475d7aadda':
Fix garbage showing up beneath dialogs
2014-09-19 15:54:01 +00:00
Amith Yamasani
8d9f121618
Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
2014-09-19 15:51:39 +00:00