Commit Graph

246497 Commits

Author SHA1 Message Date
TreeHugger Robot
67f82d16ea Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev 2016-06-03 00:18:18 +00:00
Adam Lesinski
fee32d4d5f Allow uses-library under <application>
Bug:29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23
2016-06-02 23:57:55 +00:00
Sanket Padawe
b68601d247 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 2016-06-02 23:11:23 +00:00
Todd Kennedy
bb8a42da70 Round icons
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".

Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
2016-06-02 15:57:54 -07:00
Makoto Onuki
ac042501c8 ShortcutManager: Implement usage report API
Bug 28536054

Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
2016-06-02 15:57:40 -07:00
Svetoslav Ganov
bd28e027ed Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
2016-06-02 22:47:26 +00:00
Makoto Onuki
f6be4c023f Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev 2016-06-02 22:42:03 +00:00
Philip P. Moltmann
1eabaff2cb Merge "Do not rotate PDFPrinter pages." into nyc-dev
am: 5d6a4f582e

* commit '5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
  Do not rotate PDFPrinter pages.

Change-Id: Ib428e9af14a8271545862189649780975053de86
2016-06-02 22:41:15 +00:00
Suprabh Shukla
5915d1b756 Adding an idle timeout to restart demo session
Tracking user activity from RetailModeManagerService to start and switch
to a new demo user when there has been no activity for a long time and
the demo video player has been disabled.

Bug: 27280140
Change-Id: Iebf37b5d04a659e4bfda0e4016111c7b9e5f4eb9
2016-06-02 15:40:51 -07:00
Svetoslav Ganov
e34bb5a1ff Merge "Properly set default voice interactor" into nyc-dev 2016-06-02 22:36:05 +00:00
TreeHugger Robot
5d6a4f582e Merge "Do not rotate PDFPrinter pages." into nyc-dev 2016-06-02 22:30:24 +00:00
Selim Cinek
41fe89a84a Fixed a bug where talkback couldn't scroll through notifications
Change-Id: Idac298efe3a25be1d435776817180c3acf78bf84
Fixes: 29046169
2016-06-02 15:27:56 -07:00
Svetoslav Ganov
b625e19a87 Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.

bug:28963642

Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
2016-06-02 15:25:15 -07:00
Robert Greenwalt
37409c5747 Add support for UNSOL PCO Data.
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
2016-06-02 15:21:59 -07:00
Jorim Jaggi
02082ad631 Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
am: 6321f42fbe

* commit '6321f42fbee425745de9636d45e4973fa6c470b9':
  Fix unminimizing dock stack for AppTask.moveToFront

Change-Id: I82b844611cb1761a681f91e2e26b25308202c6da
2016-06-02 22:19:12 +00:00
Annie Chin
84c074adb2 Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev 2016-06-02 22:10:01 +00:00
Billy Lamberta
24b4156861 docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed
am: a092b6cdb9

* commit 'a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
  docs: work minisite post-launch fixes

Change-Id: If59f08e5eca51e6c21a53b01854b3e0dd6fac2a6
2016-06-02 22:09:27 +00:00
TreeHugger Robot
6321f42fbe Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev 2016-06-02 22:08:15 +00:00
Jae Seo
22168a7dfc TIF: Set the surface secure
Bug: 29104650
Change-Id: I481bf30c57a7c29faaf1cafe64607c22fe55f707
2016-06-02 15:07:17 -07:00
Billy Lamberta
a092b6cdb9 docs: work minisite post-launch fixes am: 9fec73a47c
am: 84903c24ed

* commit '84903c24ed74c75a2217648a96931cc3045143ea':
  docs: work minisite post-launch fixes

Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
2016-06-02 22:04:13 +00:00
Billy Lamberta
84903c24ed docs: work minisite post-launch fixes
am: 9fec73a47c

* commit '9fec73a47c158df0a184a1f2a0301b6394cfec40':
  docs: work minisite post-launch fixes

Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
2016-06-02 21:59:29 +00:00
Pavlin Radoslavov
e47ec14318 Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.

Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.

Bug: 17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
2016-06-02 14:56:31 -07:00
Andrii Kulian
206b9faa09 Fix task selection logic
When task was selected for activity launched with flag FLAG_ACTIVITY_NEW_TASK
first matching task was omitted if there was another match lower in stack.
This lead to task shuffling in same stack.

Bug: 28848683
Change-Id: I94e55693fc7ed926fc151ba988d257bd2417dd45
2016-06-02 14:54:44 -07:00
Andrew Solovay
8febcd4df7 docs: Update N release notes for DP4
Archived the DP3 release notes, and set up the skeletal DP4 notes.
Also added information about changes to multi-window mode.

(Began this CL on mnc-io-docs, but CPing it to nyc-dev since that's
where we'll be doing the DP4 docs.)

See first comment for doc stage location.

bug: 28982873
bug: 28982952
Change-Id: I9dd8579db8b88788a89f046fe6cf2052390aade4
2016-06-02 14:43:04 -07:00
Philip P. Moltmann
e498e847c8 Merge "Move Xerox recommendation plugin to service." into nyc-dev
am: e509dcb43f

* commit 'e509dcb43fdbd949b18622a1dee7b9d7373dbabf':
  Move Xerox recommendation plugin to service.

Change-Id: I8bde4ef5c7aff566a7797ac95429a34656512048
2016-06-02 21:25:22 +00:00
Eino-Ville Talvala
c62cea89ce Camera2: Update lensShadingMap documentation
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to camera
device-processed data.

Also fix a few other wording issues in the lens shading documentation.

Bug: 18175853
Change-Id: I27691925e6496afe18f3506084d89f2523b5555d
2016-06-02 14:21:27 -07:00
Philip P. Moltmann
e509dcb43f Merge "Move Xerox recommendation plugin to service." into nyc-dev 2016-06-02 21:18:08 +00:00
Julia Reynolds
84e725309c Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Id392b79729d9f8e560554859260845d3f0972548
2016-06-02 21:14:09 +00:00
Chong Zhang
33508a49e8 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am: b1e24209f1

* commit 'b1e24209f16621fd095dacb615364bfd15dfe721':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I538add512f7899ced2e0f940b16c8c34df5a9681
2016-06-02 21:05:58 +00:00
TreeHugger Robot
30e434a996 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 2016-06-02 21:05:56 +00:00
Makoto Onuki
51ab2b3fd0 ShortcutManager: Break down unit tests
The test file is getting too big and making the IDE very slow.
Now it's split into multiple files

Change-Id: I50ed89f19defd3809f327bc21e7d9ea790dcde4e
2016-06-02 14:00:34 -07:00
Chong Zhang
b1e24209f1 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev 2016-06-02 20:58:06 +00:00
Christopher Tate
0cd6ca14eb Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia950b6992e76d05bccd5773cdda04308ddb054c0
2016-06-02 20:55:28 +00:00
Philip P. Moltmann
cd7b1b7cdf Do not rotate PDFPrinter pages.
- applyPrintAttributes is only used by PDFPrinter

Fixes: 29057330
Change-Id: I883cc64039f4ca2c93810e99d758f2dceec67a8b
2016-06-02 20:53:53 +00:00
Chris Tate
453951d077 Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev 2016-06-02 20:45:16 +00:00
Makoto Onuki
a9f262d649 Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev 2016-06-02 20:38:15 +00:00
Chong Zhang
6725472329 Fix scroll amount calculation in ViewRootImpl
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.

It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.

bug: 29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
2016-06-02 13:33:40 -07:00
Chris Wren
cf665232f3 Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev 2016-06-02 20:28:31 +00:00
Adrian Roos
237ffa48d0 Fix BigText transitions
Fixes a bug where BigText would never transition
between the expanded and collapsed version because
padding was wrongly taken into account when checking
the view height.

Change-Id: I4df242b4133dacdff77b78cc2d4ff3954b75b8a7
Fixes: 29042222
2016-06-02 13:16:30 -07:00
Billy Lamberta
9fec73a47c docs: work minisite post-launch fixes
* Localization for table of contents.

* Replace occurrences of 'app restrictions' with the preferred
term 'managed configurations' (see go/afw-words). Update resource
card titles and add page redirects.

* In guide, update language for SSO with Chrome Custom Tabs.
(Cherry-picked from 1056063.)

* Add resource card for 'Your Apps at Work' video.

bug: 28378252, 27744376
Change-Id: I8bc2e87d0486159bdd6680600b783af7334c3a58
2016-06-02 13:04:57 -07:00
Jorim Jaggi
93ef31f1ca Merge "Also update setMinLines" into nyc-dev
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb
2016-06-02 19:45:17 +00:00
Jorim Jaggi
79c0b2bcbb Merge "Also update setMinLines" into nyc-dev 2016-06-02 19:34:57 +00:00
Julia Reynolds
db3744969e Merge "Fix leak on density change." into nyc-dev
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
2016-06-02 19:30:58 +00:00
Julia Reynolds
b44ef7eb43 Fix memory leak via ZenModeController callbacks.
Bug: 29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
2016-06-02 19:30:50 +00:00
Julia Reynolds
48347048ba Merge "Hide alarm condition if there\'s no alarm." into nyc-dev
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
2016-06-02 19:30:50 +00:00
TreeHugger Robot
a31ac7ddfb Merge "Fix leak on density change." into nyc-dev 2016-06-02 19:24:16 +00:00
Julia Reynolds
62716a9197 Merge "Hide alarm condition if there's no alarm." into nyc-dev 2016-06-02 19:22:37 +00:00
Annie Chin
b6ab24f4d0 Remove SystemUIFactory.getHomeLayoutId()
Bug: 29069470

Change-Id: I19078f293c85470caac8d372d80a7a8605842c61
2016-06-02 12:18:38 -07:00
Jorim Jaggi
6afd156414 Fix unminimizing dock stack for AppTask.moveToFront
Some apps call AppTask.moveToFront instead of startActivity from
their trampoline activity. We need to handle this case also and
need to do all the post processing after starting an activity
so the docked stack gets unminimized.

Change-Id: I8400995bf1d1a4a4467d01fd55fca7e5800b4645
Fixes: 28722017
2016-06-02 19:14:06 +00:00
Chris Wren
c6a9857f35 Give the auto-merger somthing to hang on to.
Bug: 29001173
Change-Id: Ie244f79f1569e2b32be4046d111919120ce6111e
2016-06-02 15:11:48 -04:00