John Spurlock
85f84643e8
am 183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev
...
* commit '183cd9947e19d19e635db8912112bdaf81be9db8':
Zen: Fix recent regression in mode selection after reboot.
2014-09-16 22:05:13 +00:00
John Spurlock
386831dc3c
Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev
2014-09-16 21:54:02 +00:00
Andrew Lee
f8b2351237
am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev
...
* commit '258f835f705bfcead1769da703c4fdb78d71295a':
Add new DisconnectCause class to telecomm.
2014-09-16 21:51:51 +00:00
Andrew Lee
6663d4f973
Merge "Add new DisconnectCause class to telecomm." into lmp-dev
2014-09-16 21:43:17 +00:00
Craig Mautner
0760090e18
am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev
...
* commit '459b2ba58c771d67f8d119b241e8dc4f7958dd97':
Fix various bugs in DatePickerCalendarDelegate
2014-09-16 21:40:38 +00:00
Craig Mautner
f6b4254bef
Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev
2014-09-16 21:30:29 +00:00
John Spurlock
4291fb79c7
Zen: Fix recent regression in mode selection after reboot.
...
Bug:17509473
Change-Id: I761cd90384c490c7ab07fb633133535846701ce6
2014-09-16 17:02:23 -04:00
Craig Mautner
9c26b54d3c
Fix various bugs in DatePickerCalendarDelegate
...
These bugs were exposed by cts DatePickerTest.
Fixes one item in 17459129.
Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
2014-09-16 13:57:59 -07:00
Svetoslav
c11e43f9cb
am 03371fde: Merge "Print preview disappearing on screen off/on." into lmp-dev
...
* commit '03371fde628b999744cc75854ea656aa59371837':
Print preview disappearing on screen off/on.
2014-09-16 20:57:14 +00:00
Amit Mahajan
fa2beb4128
am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev
...
* commit 'c5429d6feab77ad1e426afb5bddc6fcfda06d37e':
Use Op package name when creating toasts
2014-09-16 20:57:09 +00:00
Svetoslav
e9f275d309
Merge "Print preview disappearing on screen off/on." into lmp-dev
2014-09-16 20:48:16 +00:00
Amit Mahajan
915a666c21
Merge "Use Op package name when creating toasts" into lmp-dev
2014-09-16 20:47:24 +00:00
Jeff Sharkey
881eee2c06
am 2dc7a1b5: Merge "Always force list divider in DocumentsUI." into lmp-dev
...
* commit '2dc7a1b57d4261e50d6f24989b3b7022123a4247':
Always force list divider in DocumentsUI.
2014-09-16 19:55:18 +00:00
Jeff Sharkey
47e3124da0
Merge "Always force list divider in DocumentsUI." into lmp-dev
2014-09-16 19:44:16 +00:00
Andrew Lee
7f3d41fd12
Add new DisconnectCause class to telecomm.
...
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.
Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
2014-09-16 12:07:41 -07:00
Svetoslav
863c0bf993
am ccf13317: Merge "Do not change fragments if print activity finishing." into lmp-dev
...
* commit 'ccf133173bf628df149a27481f879cd9eeacbfba':
Do not change fragments if print activity finishing.
2014-09-16 18:57:08 +00:00
Svetoslav
d724a40136
Print preview disappearing on screen off/on.
...
We were not clearing the tracked printer when the print activity is
paused and then not setting the tracked printer when the activity
is resumed.
bug:17525271
Change-Id: Ib0fb29006bfcf5ad03dce24b3407cd96dc421442
2014-09-16 11:53:19 -07:00
Svetoslav
b37b7ae137
Merge "Do not change fragments if print activity finishing." into lmp-dev
2014-09-16 18:47:45 +00:00
Jeff Sharkey
b1e71af498
Always force list divider in DocumentsUI.
...
DialogWhenLarge recently dropped the divider.
Bug: 17523958
Change-Id: I7ee3ce6853c01dbd3da6fc3e79ef02681b53df4c
2014-09-16 11:40:03 -07:00
Ji-Hwan Lee
2129c737c8
am 444a0f2d: TIF: Re-connect the session on package update.
...
* commit '444a0f2de3454e75a10edca51852250256182ff2':
TIF: Re-connect the session on package update.
2014-09-16 18:26:44 +00:00
Deepanshu Gupta
10890650b0
am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev
...
* commit '69f09fe8260cb204c57d5fca14ebeacf6ff51161':
Build LayoutLib tests with Java 6
2014-09-16 18:26:39 +00:00
Ji-Hwan Lee
9c6b5b729b
TIF: Re-connect the session on package update.
...
When TIF client tries to connect a session while TV input is being
updated, updateServiceConnectionLocked() may fail to bindServiceAsUser()
and the session state may remain indefinitely until a client tries to
create another session to connect the service. Reconnect the session by
calling updateServiceConnectionLocked() when package is updated.
Also, remove the session state when client dies before onSessionCreated().
This was causing the stale session in the above scenario (without
reconnection) to be connected to TIS even when client no longer exists.
Bug: 17518751
Change-Id: I5484df0d80c71649d22438521adf182ab59a6ce4
2014-09-16 18:21:03 +00:00
Deepanshu Gupta
bc1944560c
Merge "Build LayoutLib tests with Java 6" into lmp-dev
2014-09-16 18:16:21 +00:00
Deepanshu Gupta
0f6e5d2ab7
Build LayoutLib tests with Java 6
...
Build the layoutlib tests with Java 6, so that we can test LayoutLib on
Java 6 also.
Change-Id: I8ab344af29c880dafdc195d8b061a1d08e724e26
2014-09-16 11:11:36 -07:00
Alan Viverette
ca644614bc
am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev
...
* commit '7194361cdaad9150f8440dda99ccdc04556e73e2':
Properly handle dispatchRestoreInstanceState for new-style DatePicker
2014-09-16 18:01:05 +00:00
Jorim Jaggi
94592e0e22
am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev
...
* commit 'ac9804435867dfaaebe1887d6de30aee7758bb39':
Use RenderThread for navigation bar ripples
2014-09-16 18:01:00 +00:00
PauloftheWest
b97a3fa2be
am 0208bf01: Merge "Fixed an RTL overlapping issue in volume settings." into lmp-dev
...
* commit '0208bf01144ab0c368f81d8b196e8ece1eabd8e1':
Fixed an RTL overlapping issue in volume settings.
2014-09-16 18:00:56 +00:00
Alan Viverette
328c630ab6
Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev
2014-09-16 17:55:31 +00:00
Jorim Jaggi
e571ed0668
Merge "Use RenderThread for navigation bar ripples" into lmp-dev
2014-09-16 17:53:27 +00:00
Jorim Jaggi
072707dfad
Use RenderThread for navigation bar ripples
...
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
2014-09-16 17:51:55 +00:00
Svetoslav
23d3361e17
Do not change fragments if print activity finishing.
...
It is possible that we try to switch framents after the print
activity finish method is called. In this state the activity
is going away and trying to perform a fragment operation throws.
Now if we are finishing no fragment opration is performed.
bug:17520007
Change-Id: I0dd935d3cdaeddca31fccf49bd5de97e878abb9d
2014-09-16 10:50:55 -07:00
PauloftheWest
1dd9048b3f
Merge "Fixed an RTL overlapping issue in volume settings." into lmp-dev
2014-09-16 17:49:40 +00:00
Martijn Coenen
60acbb19e2
am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev
...
* commit '415ef6926f06ba39bd366bd1d5a6115d0aead640':
Fix static AID prefix registration.
2014-09-16 17:49:38 +00:00
Martijn Coenen
9ed2d5f746
Merge "Fix static AID prefix registration." into lmp-dev
2014-09-16 17:40:30 +00:00
PauloftheWest
2cabb42193
Fixed an RTL overlapping issue in volume settings.
...
Bug: 17468763
Change-Id: Iea9b769013e4551f8b523a08a229ed7804b275f5
2014-09-16 10:34:36 -07:00
Tony Hill
929442d509
Use Op package name when creating toasts
...
Some components may be running in processes other than their
base package using android:process directives. The op package
name must therefore be used otherwise the AppOps check will fail
due to a mismatch between the base package name and the UID.
Bug: 17431423
Change-Id: I429aa46066935b964151a2ec0854f0e14c117c4e
2014-09-16 10:16:43 -07:00
Martijn Coenen
0985fb6c42
Fix static AID prefix registration.
...
Bug: 16517161
Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
2014-09-16 10:09:12 -07:00
Adrian Roos
70ca3dea07
am 90c9f382: Merge "Properly redispatch systemUiVisibility flags" into lmp-dev
...
* commit '90c9f382e64dd6500cf1ad910d905f47f4d97f1b':
Properly redispatch systemUiVisibility flags
2014-09-16 16:47:20 +00:00
Adrian Roos
7c9823ac4f
Merge "Properly redispatch systemUiVisibility flags" into lmp-dev
2014-09-16 16:39:45 +00:00
Robert Ly
15db05c91d
am 8372379f: am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
...
* commit '8372379f5cb6b5f828093a5006d785026af764ad':
docs: remove fire and forget language from wear docs
2014-09-16 16:35:39 +00:00
Robert Ly
b84b1058d0
am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
...
* commit '6641ddf6711a7f521df6492db167598ec33d2487':
docs: remove fire and forget language from wear docs
2014-09-16 16:24:17 +00:00
Baligh Uddin
c23f8990a9
am 131e89ee: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '131e89ee2bcf17d3d7ddc08f01355f1965be0f8f':
Import translations. DO NOT MERGE
2014-09-16 15:26:40 +00:00
Baligh Uddin
e252c2765c
am 69e1dda0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '69e1dda05581da0e45b16fe2af8f93a2203eb556':
Import translations. DO NOT MERGE
2014-09-16 15:26:36 +00:00
Baligh Uddin
9a575c7d87
am 5e88c717: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5e88c71754e40e1775b58c4a561c08673a082534':
Import translations. DO NOT MERGE
2014-09-16 15:26:31 +00:00
Baligh Uddin
9206c09dca
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:18:24 +00:00
Baligh Uddin
2356487b45
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:17:08 +00:00
Baligh Uddin
71cb3a44c1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:16:40 +00:00
Martijn Coenen
cee69638fa
am cd108cbe: Merge "AID prefix registration." into lmp-dev
...
* commit 'cd108cbe643d824437e8a629aa258a62ad237b39':
AID prefix registration.
2014-09-16 15:07:07 +00:00
Martijn Coenen
7e25a504d4
Merge "AID prefix registration." into lmp-dev
2014-09-16 14:55:04 +00:00
Adrian Roos
ce4a0cf9ce
Properly redispatch systemUiVisibility flags
...
Fixes two bugs introduced by change
I7bd32531130d199c0734ffcb800194e77b7e16c3:
When the system window insets consumed by DecorView
change as a result of changing flags, the insets must
be redispatched to the hierarchy.
Also fixes a bug where, as a result of removing the wrong
implication of the SYSTEM_UI_FLAG_LAYOUT_STABLE flag by
FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, the status bar was
being forced to black when returning from recents.
Bug: 17489047
Bug: 15046646
Change-Id: I127b0ff3b17c4873a7c28d67020f84298ed09db2
2014-09-16 16:28:45 +02:00