Commit Graph

246423 Commits

Author SHA1 Message Date
Bill Yi
b67c06c31a Import translations. DO NOT MERGE
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
2016-06-03 05:23:35 -07:00
Bill Yi
4ae6354467 Import translations. DO NOT MERGE
Change-Id: I53789d03049f5647fff50cf5521b461bf5481afd
Auto-generated-cl: translation import
2016-06-03 04:57:35 -07:00
Bill Yi
2641c648f7 Import translations. DO NOT MERGE
Change-Id: Ic52f441a17948a9d117126b1e808d05535cc558d
Auto-generated-cl: translation import
2016-06-03 04:52:48 -07:00
Bill Yi
69e29c77b8 Import translations. DO NOT MERGE
Change-Id: Ibee7d58074781c85c28496af8ad0702b51fd85a8
Auto-generated-cl: translation import
2016-06-03 04:50:16 -07:00
Bill Yi
012e254040 Import translations. DO NOT MERGE
Change-Id: I680d494c4670c1ae92902559bf88849f043ba501
Auto-generated-cl: translation import
2016-06-03 04:38:00 -07:00
Bill Yi
0fbac210a7 Import translations. DO NOT MERGE
Change-Id: I5ad391c3e1b05ca8363ffca2837860946cd4570f
Auto-generated-cl: translation import
2016-06-03 04:31:48 -07:00
Bill Yi
ba14c03ddc Import translations. DO NOT MERGE
Change-Id: I2bf24aac1ece07f78ad462b670824b85945b72f0
Auto-generated-cl: translation import
2016-06-03 04:27:06 -07:00
Bill Yi
3be3f6cc5e Import translations. DO NOT MERGE
Change-Id: I1af602c8252ce1006e26a8f965fe56e976fe3439
Auto-generated-cl: translation import
2016-06-03 04:11:55 -07:00
Bill Yi
566cac1be3 Import translations. DO NOT MERGE
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
2016-06-03 04:02:53 -07:00
Bill Yi
dd92cc5dbe Import translations. DO NOT MERGE
Change-Id: Ia658676186e563e8e1e83c273fd76c011b9169ef
Auto-generated-cl: translation import
2016-06-03 03:57:53 -07:00
Bill Yi
f794288a3e Import translations. DO NOT MERGE
Change-Id: I1e9706b340786d79d7a9cdc4735137d3fcf2e840
Auto-generated-cl: translation import
2016-06-03 03:51:12 -07:00
Bill Yi
d5b0b73a51 Import translations. DO NOT MERGE
Change-Id: Ifc14a8e231354fe8cbe65f22761236006de64ce5
Auto-generated-cl: translation import
2016-06-03 03:46:06 -07:00
Tony Mak
d73c6eb6f3 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
2016-06-03 10:43:30 +00:00
Bill Yi
da085a46a0 Import translations. DO NOT MERGE
Change-Id: Ib9d08e1380ee7258fc8a760cf82a10862b35ac84
Auto-generated-cl: translation import
2016-06-03 03:43:29 -07:00
Bill Yi
1a519c545e Import translations. DO NOT MERGE
Change-Id: Ic23e11859d0b00fba56d8a3c93afbf86d139bcb4
Auto-generated-cl: translation import
2016-06-03 03:38:40 -07:00
Bill Yi
a5c543bf35 Import translations. DO NOT MERGE
Change-Id: Iec10d485540939eca94ecf3d013cb7a9cda8c4f2
Auto-generated-cl: translation import
2016-06-03 03:36:04 -07:00
Tony Mak
33d03a9e43 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
2016-06-03 10:06:06 +00:00
Bill Yi
40b69850c5 Import translations. DO NOT MERGE
Change-Id: I08aeb7a5fb63ed7d10a218d86365331c2ba02b4e
Auto-generated-cl: translation import
2016-06-02 21:18:31 -07:00
Eric Schmidt
46a51cb108 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d
am: 9ad88ce3fe

* commit '9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
  docs: Fixed background optmizations code snippet

Change-Id: I1a68f03403c34993525487f604422367f35fc0a0
2016-06-03 03:06:44 +00:00
Eric Schmidt
9ad88ce3fe Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8
am: 76297d719d

* commit '76297d719d5bbe2dcce65c357591c22b1a1d3293':
  docs: Fixed background optmizations code snippet

Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
2016-06-03 02:59:57 +00:00
Eric Schmidt
76297d719d Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am: 0b8eb8c1e8

* commit '0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
  docs: Fixed background optmizations code snippet

Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
2016-06-03 02:52:51 +00:00
Eric Schmidt
0b8eb8c1e8 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs 2016-06-03 02:41:46 +00:00
Andrii Kulian
f4b91fe3e1 Merge "Fix task selection logic" into nyc-dev
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72
2016-06-03 02:07:04 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00
Zhijun He
e8526a0105 Merge "Camera2: add deferred output config support" into nyc-mr1-dev 2016-06-03 01:14:00 +00:00
Pavlin Radoslavov
fa790104f2 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Ia2aed3304039a672961608fc900ab8996f67d716
2016-06-03 01:00:35 +00:00
Pankaj Kanwar
0bc61eb176 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 2016-06-03 00:55:50 +00:00
Sanket Padawe
1a6b6fc266 Merge "Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d" into nyc-mr1-dev 2016-06-03 00:34:03 +00:00
TreeHugger Robot
7d64d64269 Merge "Round icons" into nyc-mr1-dev 2016-06-03 00:32:35 +00:00
Adam Lesinski
c878fb0cb8 Merge "Allow uses-library under <application>" into nyc-mr1-dev 2016-06-03 00:31:37 +00:00
Zhijun He
c8b181e95d Camera2: add deferred output config support
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
2016-06-02 17:30:20 -07:00
Sanket Padawe
a7f74b1d43 Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
2016-06-02 17:20:08 -07:00
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
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
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