Commit Graph

56668 Commits

Author SHA1 Message Date
Ronghua Wu
dbbdb608c0 Merge "core: add hdr capabilities to display" into nyc-dev
am: a052cbda80

* commit 'a052cbda8099d6665e77076ae86a3f1265306caa':
  core: add hdr capabilities to display
2016-03-15 17:47:42 +00:00
Ronghua Wu
a052cbda80 Merge "core: add hdr capabilities to display" into nyc-dev 2016-03-15 17:40:14 +00:00
Ian Pedowitz
0f0fba787c Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev
am: 440ef18fe7

* commit '440ef18fe7dcfaff28fad0137f4abe4235381e05':
  Revert "Permissions: Get rid of GET_ACCOUNTS"
2016-03-15 17:15:59 +00:00
Ian Pedowitz
440ef18fe7 Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev 2016-03-15 17:09:53 +00:00
Ian Pedowitz
358e51f3d1 Revert "Permissions: Get rid of GET_ACCOUNTS"
This reverts commit d39600585b.

Bug: 27665091
Change-Id: I7d017ba7062ac594225229436d2877c7d21fb065
2016-03-15 17:08:27 +00:00
Adam Powell
d2f9090c16 Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev
am: 421806380d

* commit '421806380dcb971755caf4e61756a38566469f6e':
  Un-deprecate Activity#onRetainNonConfigurationInstance
2016-03-15 16:57:22 +00:00
Adam Powell
421806380d Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev 2016-03-15 16:51:03 +00:00
Kirill Grouchnikov
c3aa518546 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev
am: a487ab1368

* commit 'a487ab13682d6e60c6ff41a5b9f708b752efc776':
  Remove tracking of all drawables in ViewOverlay.clear()
2016-03-15 16:30:11 +00:00
Kirill Grouchnikov
a487ab1368 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev 2016-03-15 16:25:50 +00:00
Alan Viverette
0269baa345 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev
am: f068cff176

* commit 'f068cff1761a2876587caa7ca6978a848198439a':
  Push flags from top-level TypedValue into ComplexColor changing configs
2016-03-15 14:41:52 +00:00
Alan Viverette
f068cff176 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev 2016-03-15 14:36:11 +00:00
Michal Karpinski
295a0bce25 Merge "Addressing API council feedback for remote bugreports" into nyc-dev
am: 57f8462f56

* commit '57f8462f56eb2311bb409fd09848117523d3b5aa':
  Addressing API council feedback for remote bugreports
2016-03-15 14:13:56 +00:00
Michal Karpinski
37cfe71693 Addressing API council feedback for remote bugreports
In DeviceAdminReceiver fixed a broken link in javadocs and improved
javadocs for bugreport error codes.

Bug: 27532425
Change-Id: I6cf90b4109065615778e69ea9d21b1869841593b
2016-03-15 11:35:34 +00:00
Keisuke Kuroyanagi
5befed1900 Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev
am: 531d8d2fae

* commit '531d8d2faee92f8ea173440b74761bd91add2dd8':
  Re-disable drag and drop in full screen extracted mode.
2016-03-15 08:26:30 +00:00
Keisuke Kuroyanagi
531d8d2fae Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev 2016-03-15 08:21:11 +00:00
Keisuke Kuroyanagi
6229859e06 Merge "Stop automatically creating selection action mode." into nyc-dev
am: 126fdf1082

* commit '126fdf108297bd66da85edbfe6d1af2cef64404d':
  Stop automatically creating selection action mode.
2016-03-15 07:47:16 +00:00
Keisuke Kuroyanagi
126fdf1082 Merge "Stop automatically creating selection action mode." into nyc-dev 2016-03-15 07:41:07 +00:00
Keisuke Kuroyanagi
f2fbb29304 Merge "Add a check for misspelled span change." into nyc-dev
am: 794f70f172

* commit '794f70f1728123608a2bcbf2a508b31b79a931b2':
  Add a check for misspelled span change.
2016-03-15 06:51:21 +00:00
Keisuke Kuroyanagi
794f70f172 Merge "Add a check for misspelled span change." into nyc-dev 2016-03-15 06:47:10 +00:00
Keisuke Kuroyanagi
6e0860d959 Add a check for misspelled span change.
Previously, misspelled span is directly used in AddToDicitonary's
OnClickListener. It can crash because misspelled span can have been
updated since SuggestiosPopup is shown.
Also, AddToDictionary didn't work correctly in full screen extracted
mode. Use findEquivalentSuggestionSpan to resolve it.

Bug: 27557526
Change-Id: I51d713dbdd0c44ea2c553164b81b1123a2325aa1
2016-03-15 15:40:43 +09:00
Keisuke Kuroyanagi
c477b5830a Stop automatically creating selection action mode.
With Ic025c109539c3b5963, selection action mode is created always
when selection is made. It causes distraction in some cases.
This CL fixes this issue. This CL stops starting selection action
mode when action mode is currently not active and not intended to
restart.

Bug: 27536744
Bug: 27551819
Change-Id: I94ee66864000934a21ef0d18c1d71429c67114fa
2016-03-15 15:38:40 +09:00
Keisuke Kuroyanagi
fdfc93d770 Re-disable drag and drop in full screen extracted mode.
Drag and drop in full screen extracted mode was disabled by
Ifff4c30919bcb04f7d and re-enabled by I90d8e9f42f395b6b52.
However, related issues have not been fixed. This CL re-disables it.

Bug: 22440907
Change-Id: I753f69e170aa7e79478a5a4a3b89e4a7ef88c9e2
2016-03-15 14:47:08 +09:00
Keisuke Kuroyanagi
8a3474fe36 Merge "Fix: onExtractedDeleteText deletes unintended region." into nyc-dev
am: 3e540b95d7

* commit '3e540b95d751c19c846ee209a0ce425700fef203':
  Fix: onExtractedDeleteText deletes unintended region.
2016-03-15 05:40:49 +00:00
Keisuke Kuroyanagi
75d6ec5885 Merge "Show SuggestionsPopup when there is a misspelled span." into nyc-dev
am: e675665afa

* commit 'e675665afa03c70a7d2782cc08e89eeeae6e0503':
  Show SuggestionsPopup when there is a misspelled span.
2016-03-15 05:40:48 +00:00
Keisuke Kuroyanagi
3e540b95d7 Merge "Fix: onExtractedDeleteText deletes unintended region." into nyc-dev 2016-03-15 05:38:06 +00:00
Keisuke Kuroyanagi
e675665afa Merge "Show SuggestionsPopup when there is a misspelled span." into nyc-dev 2016-03-15 05:35:21 +00:00
Adrian Roos
8fa819399b Merge "Don\'t show wallpaper when backdrop is visible" into nyc-dev
am: 7400f82699

* commit '7400f82699c76618d5ca24d6528580afb4695dbf':
  Don't show wallpaper when backdrop is visible
2016-03-15 03:30:01 +00:00
Adrian Roos
7400f82699 Merge "Don't show wallpaper when backdrop is visible" into nyc-dev 2016-03-15 03:26:02 +00:00
Tyler Gunn
aa86a3a41a Merge "Add API support for multi-endpoint." into nyc-dev
am: 32d1a1a911

* commit '32d1a1a9110921dc043e4103e3ef1d075e1cf518':
  Add API support for multi-endpoint.
2016-03-15 02:07:37 +00:00
Tyler Gunn
32d1a1a911 Merge "Add API support for multi-endpoint." into nyc-dev 2016-03-15 01:59:43 +00:00
Adrian Roos
d5c2db630f Don't show wallpaper when backdrop is visible
Hides the wallpaper when it's not needed and fixes
the unlock animation to not unnecessairly show the
wallpaper if neither the Keyguard nor the underlying
app need it.

Also fixes a bug where the enter animation had a background
set, which led to uglyness when no wallpaper is involved.

Bug: 27533740
Change-Id: I667c6f7ca6c0e1ff7e9f793c6ddc13f6da8387b1
2016-03-14 18:55:41 -07:00
Carlos Valdivia
71dfb1654b Merge "Permissions: Get rid of GET_ACCOUNTS" into nyc-dev
am: 658e4c5ece

* commit '658e4c5eceefcb2f0d070d478fb1ab0af27a1bbe':
  Permissions: Get rid of GET_ACCOUNTS
2016-03-15 01:40:26 +00:00
Carlos Valdivia
658e4c5ece Merge "Permissions: Get rid of GET_ACCOUNTS" into nyc-dev 2016-03-15 01:36:26 +00:00
Tyler Gunn
876dbfb476 Add API support for multi-endpoint.
This CL includes changes required to support multi-endpoint (see the
design doc linked off the bug).

Main changes include:
- support for indicating if a call/connection is "external" to the device.
- support for indicating if an external call can be pulled from the
remote device to the local device.
- API used to initiate a pull of a call external to the current device to
the current device.
- Made the "connection event" API public (was previously @hide); this will
be used to support passing some error events involving pulling calls to
the incall ui.
- Added new InCallService metadata which will be used to determine if an
InCallService wants to be informed of external calls.
- New disconnect causes which will be used to expose the fact that a
multi-endpoint call was answered elsewhere and that a call ended because
it was pulled to another device.
- New call log call types to indicate if calls were answered elsewhere
or pulled to another device.

Bug: 27458894
Change-Id: I423f64ff965b5e50194635a51868c327782db2a1
2016-03-14 23:26:34 +00:00
Makoto Onuki
6c525ae97b Merge "Implement the launcher side permission." into nyc-dev
am: 49f6fbcd1f

* commit '49f6fbcd1f516ec543ada6aeab62eb51a3cdf712':
  Implement the launcher side permission.
2016-03-14 22:22:14 +00:00
Makoto Onuki
49f6fbcd1f Merge "Implement the launcher side permission." into nyc-dev 2016-03-14 22:12:16 +00:00
Makoto Onuki
2d5b465fa9 Implement the launcher side permission.
Only the default launcher can call the LauncherApps shortcut APIs.

Bug 27548047

Change-Id: I6d597fcad80c5201a2f93b8cbecd567fc79926d8
2016-03-14 15:00:58 -07:00
Alan Viverette
0b9295d067 Push flags from top-level TypedValue into ComplexColor changing configs
Previously a ComplexColor that was defined within varying configs would
not push the flags into its changing configs, so it wouldn't get reloaded.

This implementation follows the Drawable implementation, where the base
changing configs are stored in the superclass.

Bug: 27573177
Change-Id: I1da5ee6ab998d8296f8860c1a99d3e1399438543
2016-03-14 21:49:14 +00:00
Todd Kennedy
3dc479bd3f Merge "Fix API" into nyc-dev
am: 791a154648

* commit '791a1546484f643e98a4bb245c3b7c302b894f78':
  Fix API
2016-03-14 21:36:45 +00:00
Todd Kennedy
791a154648 Merge "Fix API" into nyc-dev 2016-03-14 21:31:44 +00:00
Todd Kennedy
948b702f39 Fix API
change name and allow passing in a boolean

Change-Id: I29b9765fedbd6b49878bb75df782012ad87a6866
2016-03-14 14:29:52 -07:00
Oren Blasberg
086c22442b Merge "Fix constant name in WallpaperManager javadoc." into nyc-dev
am: cea9f353f7

* commit 'cea9f353f79d2c367a30fa84ceca524e5eacce08':
  Fix constant name in WallpaperManager javadoc.
2016-03-14 20:47:55 +00:00
Oren Blasberg
cea9f353f7 Merge "Fix constant name in WallpaperManager javadoc." into nyc-dev 2016-03-14 20:43:43 +00:00
Jeff Davidson
cb4ad1548e Merge "NetworkStats.Bucket API polish." into nyc-dev
am: 1c0c14febf

* commit '1c0c14febfaab3fac0239328e2f3b0aaeb9bf56d':
  NetworkStats.Bucket API polish.
2016-03-14 19:35:48 +00:00
Wale Ogunwale
f12c4de1bf Merge "Added more info to FLAG_ACTIVITY_LAUNCH_ADJACENT documentation" into nyc-dev
am: 0fbdab8397

* commit '0fbdab8397ecee12d04ec5f273e7277c74e020eb':
  Added more info to FLAG_ACTIVITY_LAUNCH_ADJACENT documentation
2016-03-14 19:31:42 +00:00
Wale Ogunwale
99079b4f49 Merge "Disable FLAG_LAYOUT_NO_LIMITS window flag in multi-window mode" into nyc-dev
am: 7c74ae040d

* commit '7c74ae040d2edf956d3ec943f146c5baa93af0eb':
  Disable FLAG_LAYOUT_NO_LIMITS window flag in multi-window mode
2016-03-14 19:31:40 +00:00
Jeff Davidson
1c0c14febf Merge "NetworkStats.Bucket API polish." into nyc-dev 2016-03-14 19:30:23 +00:00
Wale Ogunwale
0fbdab8397 Merge "Added more info to FLAG_ACTIVITY_LAUNCH_ADJACENT documentation" into nyc-dev 2016-03-14 19:27:39 +00:00
Wale Ogunwale
6bdf257d43 Added more info to FLAG_ACTIVITY_LAUNCH_ADJACENT documentation
Developers need to add FLAG_ACTIVITY_MULTIPLE_TASK flag if they don't
want an existing instance of their activity to be used.

Bug: 27604971
Change-Id: I80791ba9b8a68e4ffcf7a5b9a963f27239071037
2016-03-14 19:26:37 +00:00
Wale Ogunwale
7c74ae040d Merge "Disable FLAG_LAYOUT_NO_LIMITS window flag in multi-window mode" into nyc-dev 2016-03-14 19:26:27 +00:00