Commit Graph

26915 Commits

Author SHA1 Message Date
Sudheer Shanka
9abe869a4c Merge "Update usage of DPM.getLongSupportMessageForUser." into nyc-dev am: 91f2879
am: 033f12b

* commit '033f12b680e916a241709c317e261c05bbfbdd60':
  Update usage of DPM.getLongSupportMessageForUser.

Change-Id: I529bfbdc9b4c6f9d05035f6ae4ba98d4b11040e8
2016-04-13 20:30:51 +00:00
Sudheer Shanka
033f12b680 Merge "Update usage of DPM.getLongSupportMessageForUser." into nyc-dev
am: 91f2879

* commit '91f287908b78c328e8a45f2b7bcf8f395680d59f':
  Update usage of DPM.getLongSupportMessageForUser.

Change-Id: I1747700ccd82840892574b500f253ceab3e690f2
2016-04-13 20:24:12 +00:00
Sudheer Shanka
91f287908b Merge "Update usage of DPM.getLongSupportMessageForUser." into nyc-dev 2016-04-13 20:12:03 +00:00
Andrew Sapperstein
867bb9c07a Create feature factory interface & initial impl.
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.

Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.

BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
2016-04-13 13:02:38 -07:00
Jason Monk
d49a846a39 Don't debug log on ConditionManager
Change-Id: I383c8ca4cfea732ace8213a17df375babad5f793
2016-04-13 15:30:07 -04:00
Jason Monk
3948712e7c Merge "Settings dashboard tablet fixes" into nyc-dev am: 906927f
am: e6a98a0

* commit 'e6a98a0e17d830740e95358c12abe0b38864c5f4':
  Settings dashboard tablet fixes

Change-Id: Iec6c67b5250bfacd8d795c48aae726e24e5d0be5
2016-04-13 19:28:51 +00:00
Jason Monk
e6a98a0e17 Merge "Settings dashboard tablet fixes" into nyc-dev
am: 906927f

* commit '906927f1c8e54496ab86c006d284cb32a4c35017':
  Settings dashboard tablet fixes

Change-Id: Id07dc3d4e82493f791da75acb6b379ccf7587954
2016-04-13 19:25:30 +00:00
Jason Monk
906927f1c8 Merge "Settings dashboard tablet fixes" into nyc-dev 2016-04-13 19:11:15 +00:00
Benjamin Franz
e00cd80a1e Only try disabling quiet mode
The underlying API has slightly changed to require the profile
challenge if the profile that we're trying to enable hasn't been
unlocked yet.

Bug: 27764124
Change-Id: I9efb3d3ed49034b573abb4c18119ffadcccfe947
2016-04-13 19:14:37 +01:00
Sudheer Shanka
70f4c70874 Merge "Avoid showing DeviceAdminAdd screen in the background of support dialog." into nyc-dev am: 41dde76
am: 9f5fde6

* commit '9f5fde630cfc2dd2486fb97bf607100b416df097':
  Avoid showing DeviceAdminAdd screen in the background of support dialog.

Change-Id: I560cb0819ea149e2401a55e76f564434b413a78d
2016-04-13 18:11:01 +00:00
Sudheer Shanka
b1ab7b2fdc Merge "Add new section in Apps screen to show app installer name." into nyc-dev am: f13a6a1
am: b196bb8

* commit 'b196bb89f4b7834c3f1f92e1f7c987f29f51af81':
  Add new section in Apps screen to show app installer name.

Change-Id: Idd3eb41595a924a1cf8d013bbb328b206633f142
2016-04-13 18:11:01 +00:00
Sudheer Shanka
9f5fde630c Merge "Avoid showing DeviceAdminAdd screen in the background of support dialog." into nyc-dev
am: 41dde76

* commit '41dde76a6b2aeda8ebe2354a1c760d9ed7e51fda':
  Avoid showing DeviceAdminAdd screen in the background of support dialog.

Change-Id: I0bcae090f9e91b4e67356a42fb64213c7370d3be
2016-04-13 18:00:03 +00:00
Sudheer Shanka
b196bb89f4 Merge "Add new section in Apps screen to show app installer name." into nyc-dev
am: f13a6a1

* commit 'f13a6a179523135d44166c20683fa4b6b0bf0780':
  Add new section in Apps screen to show app installer name.

Change-Id: I520c10e44a6c911e155658a62c56ea6a5c926994
2016-04-13 18:00:03 +00:00
Sudheer Shanka
41dde76a6b Merge "Avoid showing DeviceAdminAdd screen in the background of support dialog." into nyc-dev 2016-04-13 17:47:43 +00:00
Sudheer Shanka
f13a6a1795 Merge "Add new section in Apps screen to show app installer name." into nyc-dev 2016-04-13 17:47:05 +00:00
Jason Monk
64efc424b6 Merge "Protect against monkey crash" into nyc-dev am: 25d69a1
am: dca0f7a

* commit 'dca0f7ae2af427be6142e6cf83ed562a4cfef4d2':
  Protect against monkey crash

Change-Id: I6917dd2e608774de25f30ccc83c202b0ca1dc0bb
2016-04-13 17:03:22 +00:00
Jason Monk
dca0f7ae2a Merge "Protect against monkey crash" into nyc-dev
am: 25d69a1

* commit '25d69a1ae3e4d28c64e1ee18990f9b7b2f0d4238':
  Protect against monkey crash

Change-Id: I926659f92f915fc7d991ddac7f41020b0caac558
2016-04-13 16:56:47 +00:00
Jason Monk
25d69a1ae3 Merge "Protect against monkey crash" into nyc-dev 2016-04-13 16:45:16 +00:00
Jason Monk
9d0542a314 Protect against monkey crash
Change-Id: If1fd7dd51247bf29e86db16d4a01b2a45fac791e
Fixes: 27678593
2016-04-13 12:34:37 -04:00
Jason Monk
79f3706785 Settings dashboard tablet fixes
Change-Id: I21b306f6932af4fc2c5b79feeba60cdd820e2b8a
Fixes: 27834674
2016-04-13 12:24:54 -04:00
Yohei Yukawa
d50c05d3ee Merge "Revert "Revert "Fix no keyboard on N builds""" into nyc-dev am: e744ca8
am: ddfefc3

* commit 'ddfefc33fb5f1234b96edb8a11027211dce6c83a':
  Revert "Revert "Fix no keyboard on N builds""

Change-Id: Iae052343ce6bd297ca621585ae6a27f1921b06f7
2016-04-13 16:11:24 +00:00
Seigo Nonaka
ddfefc33fb Merge "Revert "Revert "Fix no keyboard on N builds""" into nyc-dev
am: e744ca8

* commit 'e744ca887c820785a2f808be5fae8a7927f19cf3':
  Revert "Revert "Fix no keyboard on N builds""

Change-Id: Ief81ac3475ced17d249f50775f43fd7d9da77579
2016-04-13 16:07:56 +00:00
Yohei Yukawa
e744ca887c Merge "Revert "Revert "Fix no keyboard on N builds""" into nyc-dev 2016-04-13 15:57:29 +00:00
Robin Lee
ce6278ec6c Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev am: 80c5d6d
am: 70dffcb

* commit '70dffcbd7783ed726addf8c4cb1f6ce068b65212':
  Include login/alwayson in legacy VPN editor dialog

Change-Id: I185821c057c2c57ce2ed133a1cb873abf30a8d9c
2016-04-13 15:39:38 +00:00
Robin Lee
70dffcbd77 Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev
am: 80c5d6d

* commit '80c5d6db754a941537711d78c8591c872adc735c':
  Include login/alwayson in legacy VPN editor dialog

Change-Id: I599a7b0609f0f141a54cc975c97801192bf17f24
2016-04-13 15:36:11 +00:00
Robin Lee
80c5d6db75 Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev 2016-04-13 15:26:45 +00:00
Jason Monk
c87aacb169 Work on settings startup speed
- Cut down on amount stored in conditions xml
 - Remove extra work from dashboard startup
 - Move summary to min priority

Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes: 28134360
2016-04-13 10:18:24 -04:00
Robin Lee
20ddd1c57b Include login/alwayson in legacy VPN editor dialog
A little more consistent with the new app VPNs' dialogs. To make this
work it was also necessary to restart the lockdown VPN every time it is
edited, which makes sense because the expected action after editing a
VPN is that it reconnects with the new settings.

Bug: 28072644
Change-Id: I4b6a6f0a6ed96d2ec6f62889fdae4abb60d0646c
2016-04-13 14:57:54 +01:00
Michal Karpinski
1e3b142ce9 Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev am: d4f4e2d
am: e7b4ba9

* commit 'e7b4ba9f53b879d322361d4e3bf480b25ea66612':
  Adjusting getTitleFromOrganizationName() after API changes

Change-Id: I9804f1f58a331ff8cbbd4edc5a35daae22feb7c0
2016-04-13 13:35:39 +00:00
Michal Karpinski
e7b4ba9f53 Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev
am: d4f4e2d

* commit 'd4f4e2d5b5ea00e63c3da230ec80d65091dcfeaa':
  Adjusting getTitleFromOrganizationName() after API changes

Change-Id: I75c070a7549e68679492e8d44676bd814bedc117
2016-04-13 13:32:19 +00:00
Michal Karpinski
d4f4e2d5b5 Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev 2016-04-13 13:28:06 +00:00
Shweta Chahar
90c4dabd19 Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev am: 1ec5f09
am: c37ce20

* commit 'c37ce205d2f9a57c546bc4885038cd65d0b8b157':
  Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine.

Change-Id: I309ed32dd240b7efed39f2c311fb0db2e1b279ab
2016-04-13 11:23:15 +00:00
shwetachahar
c37ce205d2 Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev
am: 1ec5f09

* commit '1ec5f0965a169ca9b0f005a6107d97dbd6f5841c':
  Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine.

Change-Id: I8632218c26140d16bcc23dc46bab47ef2bd28f43
2016-04-13 11:20:01 +00:00
Shweta Chahar
1ec5f0965a Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev 2016-04-13 11:09:14 +00:00
Victor Chang
3ade92eaed Merge ""CA cert installed" notification should take PO into account" into nyc-dev am: 60c7635
am: 676250e

* commit '676250e35b9345b90a9690d36c077d319c3d9da9':
  "CA cert installed" notification should take PO into account

Change-Id: I982449c67976c755d38b1253688f1b7e5d8ea47e
2016-04-13 10:28:34 +00:00
Victor Chang
676250e35b Merge ""CA cert installed" notification should take PO into account" into nyc-dev
am: 60c7635

* commit '60c76357a0477062e96a4061425523f71b00ec00':
  "CA cert installed" notification should take PO into account

Change-Id: I1fb21e592c57990935505ec470ecd34ada17cb33
2016-04-13 10:25:03 +00:00
Victor Chang
de15b7d3c3 Merge changes from topic \'TrustCert\' into nyc-dev am: c7ad054
am: d4ff940

* commit 'd4ff940bc27ed4af544dd7084c5e285b18200a3a':
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs

Change-Id: I439dfc4f6797a2fe3ffa02d7742879d60698ed57
2016-04-13 10:21:51 +00:00
Victor Chang
d4ff940bc2 Merge changes from topic \'TrustCert\' into nyc-dev
am: c7ad054

* commit 'c7ad054bfa390c3dcc91b7abb13580c4a40e6999':
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs

Change-Id: Idcb598bf78837c3589aa1a0f11a67d9e60f174ec
2016-04-13 10:18:39 +00:00
Victor Chang
60c76357a0 Merge ""CA cert installed" notification should take PO into account" into nyc-dev 2016-04-13 10:15:28 +00:00
Victor Chang
17ead044e1 "CA cert installed" notification should take PO into account
- PO shows same dialog as DO, as shown in UI mock
- Keep consumer message the same
- Add cancel button
- string change
- remove TYPE_SYSTEM_ALERT due to the bug that the dialog is shown in primary user and bypass work challenge
  (Step: unlock work user -> launch dialog -> lock work user -> unlock personal user -> the dialog is still shown)
- Remove dismissKeyguard, because I believe the dialog should still be protected by the keyguard

Bug: 25772443
Bug: 18224038
Change-Id: I4f2580d1f6d2f88cfeadebcf6e8b0406e5c4b413
2016-04-13 11:13:58 +01:00
Victor Chang
c7ad054bfa Merge changes from topic 'TrustCert' into nyc-dev
* changes:
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs
2016-04-13 10:12:13 +00:00
Ricky Wai
03a592c5ea Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev am: 4a314fc
am: a71beeb

* commit 'a71beeb7fd76bcc0e0a7a018c3387619ee541a27':
  Show "work mode off" dialog when work security option is clicked

Change-Id: I2178097b9b0ef3d8868ff3aafc488b220656245e
2016-04-13 10:11:57 +00:00
Ricky Wai
c828849403 Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev am: 4f19945
am: 0710a4c

* commit '0710a4c96dcfa9684535fd67e2b5b81d3fc3e88d':
  Unified work lock checkbox should roll back when user cancels confirm dialog

Change-Id: Ifb3574fc80edb75662baa275b537761c574f6605
2016-04-13 10:11:57 +00:00
Ricky Wai
a71beeb7fd Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev
am: 4a314fc

* commit '4a314fc3caa3db8220f2192dd9f3f54144aaa0b0':
  Show "work mode off" dialog when work security option is clicked

Change-Id: I1418b2112f91cc6f02a00e7091520aab3006b067
2016-04-13 10:08:37 +00:00
Ricky Wai
0710a4c96d Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev
am: 4f19945

* commit '4f1994598ba27907614d381d2792508367a05131':
  Unified work lock checkbox should roll back when user cancels confirm dialog

Change-Id: Ie83daa2b232ddd6a7f733ddb8b9f0f733d62bccb
2016-04-13 10:08:37 +00:00
Ricky Wai
4a314fc3ca Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev 2016-04-13 10:04:52 +00:00
Ricky Wai
4f1994598b Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev 2016-04-13 10:04:23 +00:00
Ricky Wai
616342bb94 Show "work mode off" dialog when work security option is clicked
Bug: 28158297
Change-Id: I31bc3197d2ff9c95419ea87d009fe7d677181d69
2016-04-13 10:03:31 +00:00
Seigo Nonaka
259775314a Revert "Revert "Fix no keyboard on N builds""
Looks like the underling issue is not fixed yet.

This reverts commit 7bb0465687.

Bug: 26190615
Bug: 28151196
Change-Id: Icee6d90fc4336e832f082ce2974edfa558170030
2016-04-13 08:41:43 +00:00
Nicolas Prévot
b1a41697dd Merge "Show the right icon and label for work profile in data usage." into nyc-dev am: a3d18c0
am: 51ecf5c

* commit '51ecf5c8b202f35cacbc6d5bb9f04b7b30dca34e':
  Show the right icon and label for work profile in data usage.

Change-Id: Ieae26b3f83854d63d322200f0a2038db1976a7ce
2016-04-13 08:34:54 +00:00