Commit Graph

4335 Commits

Author SHA1 Message Date
Chris Craik
e972467930 am ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
* commit 'ca0790cdcdd95028f3e34c72a64b14658250fe7f':
  Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
2015-05-12 20:01:03 +00:00
Chris Craik
1d0b13b747 am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
* commit 'db05ea901041258a64477c51456c9092a826d0cf':
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
2015-05-12 17:49:22 +00:00
Chris Craik
6a49ddef62 Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
Fix import

This reverts commit 7ed1431c83.

Change-Id: Id93eba3ed1d47a90384ba20dea6f74d78755792b
2015-05-12 10:44:30 -07:00
Chris Craik
99aac0fc62 am f3aad322: am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
* commit 'f3aad32205f3e4acdfe092a78819cacdfec54f91':
  Revert "Use default constructor to get anti-aliasing"
2015-05-12 17:33:00 +00:00
Chris Craik
7ed1431c83 Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
This reverts commit dfe0a66cec.

Change-Id: I58a1bae649a284f3d3b6213064d903ea7fcf185a
2015-05-12 17:22:22 +00:00
Chris Craik
dfe0a66cec Revert "Use default constructor to get anti-aliasing"
bug:20948129

This reverts commit 58fc522a69.

Change-Id: Iddeccb4ad15b843bb3e610bd3673a0c7abc1bf46
2015-05-12 16:36:49 +00:00
Fabrice Di Meglio
f7c087ba57 am 4d5f8fbf: am e2f43948: Merge "Add user selectable Default Browser feature - part 6" into mnc-dev
* commit '4d5f8fbf6e48bba209506f5291cfeebf7aff6177':
  Add user selectable Default Browser feature - part 6
2015-05-12 01:14:26 +00:00
Fabrice Di Meglio
e2f43948d1 Merge "Add user selectable Default Browser feature - part 6" into mnc-dev 2015-05-12 00:52:58 +00:00
Fabrice Di Meglio
3453e081e0 Add user selectable Default Browser feature - part 6
- if a default Browser is not defined and if a Browser App
is selected into the disambiguation dialog, then make it as
the default Browser
- clear default Browser saved data (package name) when
the default Browser App is removed

See bug #20144393

Change-Id: Ia8621d7a61ec2cb60deded9d70f75f1e1d88d123
2015-05-11 17:46:23 -07:00
Adam Powell
f003c79256 am 44e89c49: am 5fccffd5: Merge "Bringing new Chooser UI closer to spec" into mnc-dev
* commit '44e89c496202ae4ee5bf5b7ebfd16c332f908c00':
  Bringing new Chooser UI closer to spec
2015-05-11 19:29:57 +00:00
Adam Powell
5fccffd573 Merge "Bringing new Chooser UI closer to spec" into mnc-dev 2015-05-11 19:17:29 +00:00
Adam Powell
7d7580019e Bringing new Chooser UI closer to spec
Separate the chooser targets into rows by type. Remove some API that
was redundant with LabeledIntent, simplifying ChooserTarget.

Change-Id: I90de471825f05d85e6ffbe72a32fb597be824a30
2015-05-11 12:16:19 -07:00
John Spurlock
31f6e2dcb2 am e1e7b05b: am 4cf2ae9c: Merge "Add new metrics categories for the two notification access screens." into mnc-dev
* commit 'e1e7b05b54799d12b2290eacf5d812b413ad25ba':
  Add new metrics categories for the two notification access screens.
2015-05-11 16:02:09 +00:00
Abodunrinwa Toki
a98c27913e am 33808e8b: am f864d925: Merge "Set FloatingToolbar width for portrait and landscape." into mnc-dev
* commit '33808e8ba785c29e2c0a7ba32be0bd03058d5c9a':
  Set FloatingToolbar width for portrait and landscape.
2015-05-11 15:51:30 +00:00
John Spurlock
4cf2ae9c55 Merge "Add new metrics categories for the two notification access screens." into mnc-dev 2015-05-11 15:48:47 +00:00
Chris Wren
542731ffb3 am 100cf21f: am df2e2809: Merge "log more settings actions" into mnc-dev
* commit '100cf21fced76b907c503af197798598211b2848':
  log more settings actions
2015-05-11 15:28:09 +00:00
Abodunrinwa Toki
f864d925bf Merge "Set FloatingToolbar width for portrait and landscape." into mnc-dev 2015-05-11 15:27:26 +00:00
John Spurlock
cfc66e3339 Add new metrics categories for the two notification access screens.
Bug: 20916418
Change-Id: Iafcaccaa465a2f121a6a1a2ba54b122173e45dc6
2015-05-11 11:19:55 -04:00
Chris Wren
df2e2809bf Merge "log more settings actions" into mnc-dev 2015-05-11 15:07:21 +00:00
Abodunrinwa Toki
c0fa6bd7ac Set FloatingToolbar width for portrait and landscape.
Bug: 20711006
Change-Id: Iee061a1031406780eb0f85201543b644fbb4d813
2015-05-11 14:28:48 +01:00
Chris Wren
9e7283f6a3 log more settings actions
airplane: quick and slow settings
  bluetooth: quick and slow settings
  cellular data: quick and slow settings
  dnd: quick and slow settings
  wifi: quick settings (slow already done)
  cast: quick settings
  user: quick settings

include state of the toggle in the action log

Back away slowly from the over-generalization of logging
around handleClick, the semantics of mState are particular
to the individual tiles.

Bug: 20264417
Change-Id: I4cecbd3361af64d08de9fb41b8dca210a8086a80
2015-05-08 22:25:40 -04:00
Alan Viverette
155a9aef7f am 98c664a9: am f659a56c: Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev
* commit '98c664a930ca00019c6e36598ad1b2961323f2b8':
  Replace usages of deprecated version of TextView.setTextAppearance()
2015-05-09 00:41:55 +00:00
Alan Viverette
f659a56c30 Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev 2015-05-09 00:20:04 +00:00
Alan Viverette
bb98ebd6b1 Replace usages of deprecated version of TextView.setTextAppearance()
Change-Id: Ie501affe2e3a275d3172ce8ed584ba1cd5494da8
2015-05-08 17:17:44 -07:00
Fyodor Kupolov
8bc22f5218 am 85dbc345: am 4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev
* commit '85dbc345dab0085098a719a6fd56ceb82f59efa6':
  Remove restrictions PIN functionality
2015-05-08 23:33:13 +00:00
Mark Salyzyn
86d8d73bf2 am 0720a542: Merge "BootReceiver: scrub APANIC"
* commit '0720a542ddfec61046d8dd33727dcbaf5c1ac6f5':
  BootReceiver: scrub APANIC
2015-05-08 23:12:07 +00:00
Fyodor Kupolov
4f434a0470 Merge "Remove restrictions PIN functionality" into mnc-dev 2015-05-08 23:10:31 +00:00
Mark Salyzyn
61df07e150 BootReceiver: scrub APANIC
(Cherry pick from commit b49dd577f4)

Bug: 19525200
Change-Id: I940e25a6dd20d53d44ad8848f490ac18c5e971e9
2015-05-08 15:48:38 -07:00
Mark Salyzyn
0720a542dd Merge "BootReceiver: scrub APANIC" 2015-05-08 22:47:05 +00:00
Chris Wren
5df8172053 am 1b61d8de: am d11ad51d: Merge "add logging to quick settings tiles" into mnc-dev
* commit '1b61d8de9336cd64ee5b859249cdef3434ff1c9c':
  add logging to quick settings tiles
2015-05-07 19:55:04 +00:00
Chris Wren
d11ad51d11 Merge "add logging to quick settings tiles" into mnc-dev 2015-05-07 19:23:34 +00:00
Chris Wren
457a21cdea add logging to quick settings tiles
QS Grid visibility
  Tiles that are visibile in the grid
  Taps on tiles
  Detail visibility for DND, Users, and Data

Bug: 20264417
Change-Id: I95e65484a9be0a53a071bc12ce8195120582621e
2015-05-07 15:14:28 -04:00
Alan Viverette
ec96894fcd am c7f2b6d8: am 43ea92b8: Merge "Remove dead code from EpicenterTranslateClipReveal" into mnc-dev
* commit 'c7f2b6d80d115781048b29365278fe3faae01a08':
  Remove dead code from EpicenterTranslateClipReveal
2015-05-07 19:05:28 +00:00
Alan Viverette
227df79773 am 209d6157: am 83ce3b26: Merge "Make popup window enter animation more like app transition enter" into mnc-dev
* commit '209d6157180661a52998aa242842d6eda7332d32':
  Make popup window enter animation more like app transition enter
2015-05-07 19:04:56 +00:00
Alan Viverette
6689a013b3 Remove dead code from EpicenterTranslateClipReveal
Change-Id: Id2ba801b61cf419b43188514b36cf869b4f836a6
2015-05-07 10:38:26 -07:00
Alan Viverette
83ce3b26b6 Merge "Make popup window enter animation more like app transition enter" into mnc-dev 2015-05-07 17:25:37 +00:00
Alan Viverette
4ea5ee2330 Make popup window enter animation more like app transition enter
Merges the translate and clip reveal so that we can adjust the clip
position based on the current translate position. This ensures the
clip appears to expand from the center of the translated popup and
never extends outside the window bounds.

Change-Id: I8bbb9c0e2293a25f7807d71d9b8779bb782d4784
2015-05-07 10:07:42 -07:00
Paul Jensen
b594a96b94 am 8bdd2a49: am ffe2dda1: Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev
* commit '8bdd2a49781bd5bd56a04aa483da7b4991af57f8':
  Avoid NPE when sendMessage is called after disconnect.
2015-05-07 16:23:13 +00:00
Andreas Gampe
481ecde0c2 am f40149ff: Merge "Frameworks/base: Fix null-pointer access"
* commit 'f40149ff1f067193239c7b93f8fa617ceec101fe':
  Frameworks/base: Fix null-pointer access
2015-05-07 16:16:18 +00:00
Andreas Gampe
f40149ff1f Merge "Frameworks/base: Fix null-pointer access" 2015-05-07 15:47:31 +00:00
Paul Jensen
ffe2dda135 Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 2015-05-07 15:30:47 +00:00
Paul Jensen
d0d420587a Avoid NPE when sendMessage is called after disconnect.
This avoids an NPE that could occur when:
1. disconnect() is called
2. sendMessage() is called but encounters a RemoteException
3. replyDisconnected() will attempt to dereference mSrcHandler
There does not appear to be any callers that rely on the NPE.
All callers erase their reference to the AsyncChannel after
calling disconnect(), except for NetworkAgentInfo which can
cause ConnectivityService to crash.  This fix addresses that.

bug:20647016
Change-Id: I89864885dc3371941407a036b7b7647e0ec037b8
2015-05-07 10:44:32 -04:00
George Mount
fa21641122 Merge "Add CallbackRegistry." into mnc-dev 2015-05-07 14:34:58 +00:00
Seigo Nonaka
14e139179b Retry "Always show auxiliary subtypes from NavBar keyboard icon."
This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was
reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build
breakage in 'layoutlib' target, with a proper fix.

Hereafter the original CL description is repeated.

The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994
Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
2015-05-06 21:34:07 -07:00
Bart Sears
1b0888fe8e Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 01:52:08 +00:00
Bart Sears
d130bdc462 Revert "Always show auxiliary subtypes from NavBar keyboard icon."
CL is breaking the build.  Discussed with Seigo and verting until he can take a look at it.

This reverts commit 80ff4ed6bb.

Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
2015-05-07 01:51:28 +00:00
Adam Powell
6711f3b34c Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.

Bug 19606548

Change-Id: Id07b791d178fa447010b49b24726b52208838e88
2015-05-06 15:57:09 -07:00
Adam Powell
cfd6e9dfd0 Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev 2015-05-06 21:09:20 +00:00
Fyodor Kupolov
ef24909d84 Remove restrictions PIN functionality
Bug: 20852231
Change-Id: I5666ee28ff1341ead9b258bc0852d8ba6d313c5e
2015-05-06 13:36:03 -07:00
Seigo Nonaka
06bdf9c6a6 Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev 2015-05-06 20:31:19 +00:00