Commit Graph

27626 Commits

Author SHA1 Message Date
Clara Bayarri
36f6c6cb19 Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 6a782d9" into nyc-mr1-dev-plus-aosp
am: b396a08

* commit 'b396a0897e0f55de254e12179d75c38ea53fb896':

Change-Id: I095c7133f26e03eac670689f2833f9b2625924ca
2016-04-20 13:37:23 +00:00
Clara Bayarri
bfb48f099a Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 38ee923
am: 83ff72c

* commit '83ff72cd44cd5b8638e002e784f7c5b96b379e2b':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: Ibe735f3be61cc1b6ceb8a30e9060dc3d8dc9eefc
2016-04-20 13:37:23 +00:00
Android Build Merger (Role)
b396a0897e Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 6a782d9" into nyc-mr1-dev-plus-aosp 2016-04-20 13:34:13 +00:00
Clara Bayarri
d67f9a41fb Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc
am: 6a782d9

* commit '6a782d925f456209de47569fd7308e43a94a7f94':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I5840c18389d1dbcd6bb2a8121ddf4ad3302548fc
2016-04-20 13:34:03 +00:00
Clara Bayarri
83ff72cd44 Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc
am: 38ee923

* commit '38ee923a5e97e87e5e1135ac3b8d588d90e0c446':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I519a294015346595bf20d35ab35fb5c5663e58d6
2016-04-20 13:34:02 +00:00
Clara Bayarri
38ee923a5e Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am: 81c03dc

* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63
2016-04-20 13:30:46 +00:00
Clara Bayarri
6a782d925f Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am: 81c03dc

* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I336ea364687f696ea90c3261c843447175f00d26
2016-04-20 13:30:45 +00:00
Clara Bayarri
81c03dc32f Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev 2016-04-20 13:24:43 +00:00
Clara Bayarri
cd6a2115c6 Fix Developer options appears after first boot, disappers on Settings Menu Reload
The Tiles are updated to disabled via PackageManager, which takes a few
seconds to kick in and hence the user sees the option appear and then
disappear. Making Developer Options disabled by default fixes the flash.

Note now the opposite happens, on eng builds where Developer Settings
are on by default they will not appear until the PackageManager update
has cleared.

Bug: 28121698
Change-Id: Ic7147e4430e2332d596ce37dbbce30e330dcf551
2016-04-20 11:51:52 +01:00
Sudheer Shanka
c779bece31 Apply policy transparency to "Stay awake" in Development settings.
Bug: 28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3
2016-04-19 22:49:45 -07:00
Sudheer Shanka
7e09747415 Fix summaries of some restricted switch preferences.
Bug: 27659072
Change-Id: I2cfb270ba77b0cfe3c81097b59779f70062b9b65
2016-04-19 21:46:31 -07:00
Daichi Hirono
4878073ed6 Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: 4362396184" into nyc-mr1-dev-plus-aosp
am: 5fafee9819

* commit '5fafee981993da295aecc34a9601c6a59ca41af2':

Change-Id: Ic12f33600b6c106049963b7e0c1f64ba747b734a
2016-04-20 00:16:30 +00:00
Daichi Hirono
9b182e8c2b Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: ef5285e3f6
am: 1a7aa2654f

* commit '1a7aa2654fba1368aa28074e667f7d4460bd3da5':
  Add nullcheck to StorageSettings.

Change-Id: Ied5f853f7e86aa9b7298ad9ef6c01410a2d0f217
2016-04-20 00:16:29 +00:00
Android Build Merger (Role)
5fafee9819 Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: 4362396184" into nyc-mr1-dev-plus-aosp 2016-04-20 00:14:19 +00:00
Daichi Hirono
f3d0b4af2f Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
am: 4362396184

* commit '4362396184d0da37ad5d955f37dead01f6df5455':
  Add nullcheck to StorageSettings.

Change-Id: If0bac078c1d147c7d966fab8610e6a9fa629a0ae
2016-04-20 00:14:13 +00:00
Daichi Hirono
1a7aa2654f Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
am: ef5285e3f6

* commit 'ef5285e3f6b83cbb32af1cda334a56477b7cdf3d':
  Add nullcheck to StorageSettings.

Change-Id: Ib04ec248edcb5e46ac90c2cbb5c6662b7d5d3b47
2016-04-20 00:14:11 +00:00
Daichi Hirono
ef5285e3f6 Merge "Add nullcheck to StorageSettings." into nyc-dev
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I58982903534d2dce24bd453bc72617a607373684
2016-04-20 00:12:03 +00:00
Daichi Hirono
4362396184 Merge "Add nullcheck to StorageSettings." into nyc-dev
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I749ecbe1ae8ce687ae9feca98a75539405b0a579
2016-04-20 00:12:03 +00:00
Daichi Hirono
0e048a11c7 Merge "Add nullcheck to StorageSettings." into nyc-dev 2016-04-20 00:04:11 +00:00
Amit Mahajan
fe25483a6b resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp am: d2477357e8
am: 198b92d037

* commit '198b92d0374982030d694ee1f941a3ee98714606':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: I34f602abab2f3e2e63124e642ee65675de061a4d
2016-04-19 23:28:47 +00:00
yifan.bai
198b92d037 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp
am: d2477357e8

* commit 'd2477357e86f453b8aef9e4255edf55625c5cd3d':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: Ieb25454381616d68458e8416ffe933b77dcec9fd
2016-04-19 23:26:31 +00:00
Amit Mahajan
d2477357e8 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp
Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc
2016-04-19 16:15:56 -07:00
yifan.bai
5213f71536 Merge "Fix APN cannot save after ApnEditor is paused."
am: 052768a8b5

* commit '052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9
2016-04-19 23:06:49 +00:00
Andrew Sapperstein
13792886a7 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
(cherry picked from commit 867bb9c07a)
2016-04-19 23:01:49 +00:00
Amit Mahajan
052768a8b5 Merge "Fix APN cannot save after ApnEditor is paused." 2016-04-19 22:58:18 +00:00
Maurice Lam
fd03c3b366 [Fingerprint] Update strings
Update the label for the options in setup to match the flow model of
setup wizard.

Bug: 28219260
Change-Id: Ia975b5fc95c7c82c5ec23a2af5dcdcd9d69bb594
2016-04-19 14:24:17 -07:00
Android Build Merger (Role)
c3eeb35841 Merge "Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 2620e24 am: 29a04c0" 2016-04-19 21:02:59 +00:00
Android Build Merger (Role)
56bc22b88a Merge "Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 3d2cba5 am: a1acb6a" 2016-04-19 21:02:57 +00:00
Johan Redestig
e6e3da9b46 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 2620e24
am: 29a04c0

* commit '29a04c05a51fa6751a4138c661d728ae57cde643':

Change-Id: Id4661ac95b189246c3006f619a8c90b3e444ce09
2016-04-19 21:02:50 +00:00
Johan Redestig
ed88b97855 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 3d2cba5
am: a1acb6a

* commit 'a1acb6a9f8c99a93e44744d2070995a490e3ad5c':
  Fix back button on fragments without help uris

Change-Id: I953a114db8d8600d5f8883428d5ded1f3f501250
2016-04-19 21:02:49 +00:00
Robin Lee
c1dcea2600 Merge "One updateSummary method called by all VPN prefs" 2016-04-19 21:02:47 +00:00
Udam Saini
29a04c05a5 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
am: 2620e24

* commit '2620e248f37da0135bbbb37294aba48a5c426f38':

Change-Id: I9fd5132af3b89cda76005e6cb85dc7ebdd49d10e
2016-04-19 20:57:38 +00:00
Udam Saini
a1acb6a9f8 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
am: 3d2cba5

* commit '3d2cba56632ad05427dc058b8097c18ed954296e':
  Fix back button on fragments without help uris

Change-Id: I0141b385ff13002c9975b6d050753cec0ca87ff5
2016-04-19 20:54:14 +00:00
Johan Redestig
3d2cba5663 Merge "Fix back button on fragments without help uris" into nyc-dev
am: ed74511

* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
  Fix back button on fragments without help uris

Change-Id: Iea98f27e3784bb34fd4a272f2c450a5704e6555d
2016-04-19 20:51:10 +00:00
Johan Redestig
2620e248f3 Merge "Fix back button on fragments without help uris" into nyc-dev
am: ed74511

* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
  Fix back button on fragments without help uris

Change-Id: I327abac867272c5900603d71d6e7ed4370dc0c48
2016-04-19 20:50:48 +00:00
Udam Saini
ed74511cb1 Merge "Fix back button on fragments without help uris" into nyc-dev 2016-04-19 20:39:29 +00:00
Robin Lee
903843e6f9 One updateSummary method called by all VPN prefs
Having multiple methods means inevitably when new features are added to
the preferences, the right calls aren't made so information on the
screen lags between updates.

Bug: 28257641
Change-Id: I336aeefd5941ccf808dc9070427209a7d2530032
2016-04-19 19:09:19 +00:00
Felipe Leme
1ec9b27adc Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d am: 9a22ccd
am: 63e3941

* commit '63e39411ea65fdf7a4e3809360d72ac32b68350e':

Change-Id: I2b8ca5400716f73800079f00ad5e470e73d3db43
2016-04-19 19:02:07 +00:00
Felipe Leme
0f1ca5092e Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d am: c838707
am: 51ea751

* commit '51ea751ff58dba8a18c358098cf1b09d2d29443b':
  Fixed AccessPreference listener.

Change-Id: Idca75d7862d13502d084e6770b00f21cc5950932
2016-04-19 19:02:06 +00:00
TreeHugger Robot
63e39411ea Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
am: 9a22ccd

* commit '9a22ccde2f0fe216e59ebf512e2846ff26f0b753':

Change-Id: Iffe9ac9c0e0307bb86f5920c8b1df465ccf70bbe
2016-04-19 19:01:39 +00:00
TreeHugger Robot
51ea751ff5 Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
am: c838707

* commit 'c8387072eefd1871b34ac373f986c441b909b5bd':
  Fixed AccessPreference listener.

Change-Id: I00f43d6145d7de3cc5ee73a3a231f49dd951d922
2016-04-19 18:59:31 +00:00
Felipe Leme
9a22ccde2f Merge "Fixed AccessPreference listener." into nyc-dev
am: 40c228d

* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
  Fixed AccessPreference listener.

Change-Id: I7f47a8a2ce57e3cb17aef915b9430c1be5b0da15
2016-04-19 18:59:26 +00:00
Victor Chang
ae876a2e4b Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 am: 063ae24
am: dc1f7d7

* commit 'dc1f7d75841654b31e0c010c85478a92fed3312e':

Change-Id: I2bf4bfe75919e73c4ce48d044db260a17525cfd1
2016-04-19 18:49:27 +00:00
Victor Chang
9c751b518f Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 am: f766cc8
am: ad8d93c

* commit 'ad8d93ce4f50c5d91bc1df2cebffce1c85e34040':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I82a727d2c3f436f6292f6c7f4a12c5d0f7853bdb
2016-04-19 18:49:26 +00:00
Victor Chang
dc1f7d7584 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7
am: 063ae24

* commit '063ae24903e47e6a4c1192d480e1dffa33be39c0':

Change-Id: I836a949927d865feedc1cc6076357c2d6b84eb76
2016-04-19 18:46:26 +00:00
Felipe Leme
c8387072ee Merge "Fixed AccessPreference listener." into nyc-dev
am: 40c228d

* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
  Fixed AccessPreference listener.

Change-Id: Idca40034b476faf3be1a83a3e8cb224b8c3c8680
2016-04-19 18:45:51 +00:00
Victor Chang
ad8d93ce4f Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7
am: f766cc8

* commit 'f766cc83951fff0c26ca57b074693ef8a4775283':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: Iadbd090b2a15b91137e170b7a22827d7fb3293e0
2016-04-19 18:42:48 +00:00
Jason Monk
0a8d0350b9 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 am: 7e62eef
am: 3bd5600

* commit '3bd5600360531c45dc57c5826ecd7fb64efcf1d6':

Change-Id: I2e840f09bfe1cd701df07447172c91156229e671
2016-04-19 18:41:38 +00:00
Jason Monk
0c0069fed1 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 am: 4619c9c
am: 50d03f4

* commit '50d03f4f654e0ce900eaa4201c732eb6c8392cef':
  Fix account screen in split screen

Change-Id: I03a079678ddad2a0e9093e848621604b0992aaf6
2016-04-19 18:41:36 +00:00
TreeHugger Robot
40c228d989 Merge "Fixed AccessPreference listener." into nyc-dev 2016-04-19 18:41:06 +00:00