Commit Graph

26656 Commits

Author SHA1 Message Date
Jason Monk
a0a1055316 Merge "Add minimum date" into nyc-dev
am: 17b554c

* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
  Add minimum date

Change-Id: I12809498e61faa81775d7ba97d358db779c0a14b
2016-04-20 20:48:42 +00:00
TreeHugger Robot
8b8002b508 Merge "Remove some of the unused assets" into nyc-dev 2016-04-20 20:42:55 +00:00
Jason Monk
17b554c8b7 Merge "Add minimum date" into nyc-dev 2016-04-20 20:36:36 +00:00
Julia Reynolds
472526e53f Don't save a rule without a name.
Bug: 28282339
Change-Id: Ie0a66f980c920354d172be4f0b91584338efce69
2016-04-20 16:08:30 -04:00
Ruben Brunk
0db43e44d0 Merge "Add settings for altering VR display behavior." into nyc-dev
am: 3a3d110

* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
  Add settings for altering VR display behavior.

Change-Id: I051c2374bfc6ecaafff178e06079434958f53136
2016-04-20 20:04:03 +00:00
Ruben Brunk
3a3d110a50 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:50 +00:00
Ruben Brunk
e4d95c087b Add settings for altering VR display behavior.
Bug=28208992

Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
2016-04-20 12:49:05 -07:00
Jason Monk
78f7b416c0 Add minimum date
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842
2016-04-20 15:44:21 -04:00
Jason Monk
7f4a231d89 Remove some of the unused assets
Probably didn't get them all, but this is good enough for now.

Change-Id: I86637d7ae1e31ba9cd625589fa1e4ded32cca4b3
Fixes: 27816752
2016-04-20 15:10:08 -04:00
Fan Zhang
2869157ba9 Display setting and support in a tab layout - DO NOT MERGE
Bug: 28269035
Bug: 28139604
2016-04-20 11:42:15 -07:00
Udam Saini
415fef89f3 Fixes a string for tablets/devices
Had accidentally always set this to phone.

bug:28293197
Change-Id: I926e4c9681f2e7e660bdc2664256c8a7ea6e7951
2016-04-20 11:27:02 -07:00
Sudheer Shanka
14aa458510 Merge "Fix summaries of some restricted switch preferences." into nyc-dev
am: c2dae39

* commit 'c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
  Fix summaries of some restricted switch preferences.

Change-Id: Ie84937b155d8c5382bbb697c3f70fccaf28b897e
2016-04-20 18:16:26 +00:00
Sudheer Shanka
c2dae39ab4 Merge "Fix summaries of some restricted switch preferences." into nyc-dev 2016-04-20 18:04:12 +00:00
Sudheer Shanka
c80d630559 Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
am: b2f161a

* commit 'b2f161ab389469c7029efe4915aef06e9671ffdb':
  Apply policy transparency to "Stay awake" in Development settings.

Change-Id: I22816dad3b6a96d36062f395847eec36db205363
2016-04-20 18:02:35 +00:00
Jason Monk
040acf7dab Merge "Daydream -> Screen saver" into nyc-dev
am: ea80ebc

* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
  Daydream -> Screen saver

Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae
2016-04-20 17:56:04 +00:00
Felipe Leme
4d1954f71f Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
am: 4f5568a

* commit '4f5568a8a0cd69968ae0a5278bb06ea8adc9414f':
  Listen to INetworkPolicyManager events and update UI accordingly.

Change-Id: Iba51d696311d4ddafb34b0e21341ad63239ab89d
2016-04-20 17:56:04 +00:00
Sudheer Shanka
b2f161ab38 Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev 2016-04-20 17:50:32 +00:00
Jason Monk
ea80ebcd92 Merge "Daydream -> Screen saver" into nyc-dev 2016-04-20 17:49:02 +00:00
TreeHugger Robot
4f5568a8a0 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev 2016-04-20 17:44:55 +00:00
Jason Monk
1ecc1f69b8 Daydream -> Screen saver
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
2016-04-20 13:39:18 -04:00
Jason Monk
18bf2fbdac Merge "Fix sim status screen" into nyc-dev
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491
2016-04-20 17:32:39 +00:00
Jason Monk
e9dffcd34d Merge "Fix sim status screen" into nyc-dev 2016-04-20 17:24:24 +00:00
Jason Monk
13d1c384e8 Fix sim status screen
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774
2016-04-20 13:22:36 -04:00
Jason Monk
018d99cd28 Merge "Fix storage title clearing in multi-window" into nyc-dev
am: 0bea8a9

* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
  Fix storage title clearing in multi-window

Change-Id: Ic0063a2c0c4b705001ec9de42dc9054794e0d6f4
2016-04-20 17:19:11 +00:00
Jason Monk
0bea8a9f48 Merge "Fix storage title clearing in multi-window" into nyc-dev 2016-04-20 17:08:29 +00:00
Jason Monk
f3446f98d5 Fix storage title clearing in multi-window
By accurately tracking detached state.

Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238
2016-04-20 13:05:45 -04:00
Andrew Sapperstein
1d1a2694e9 Remove ToastController.
Wasn't meant to be submitted.

Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit 17047d1939)
2016-04-20 16:54:13 +00:00
Andrew Sapperstein
12344c5ff5 Merge "Create feature factory interface & initial impl." into nyc-mr1-dev 2016-04-20 16:53:02 +00:00
Felipe Leme
85c63f348f Listen to INetworkPolicyManager events and update UI accordingly.
BUG: 27481520

Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
2016-04-20 09:17:14 -07:00
Clara Bayarri
b4d55a2050 Remove Secure Startup option from Security Settings
Bug: 27440560
Change-Id: Iff700e4e759aea88f8e71f1fdff1837962f84a92
2016-04-20 15:02:44 +01:00
Jason Monk
523f5228d4 Merge "Potential fix for receiver leak problem" into nyc-dev
am: 623a289

* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
  Potential fix for receiver leak problem

Change-Id: Id8f248da03867074561ce3c34cff80ffcb84ad93
2016-04-20 13:59:15 +00:00
Jason Monk
623a289b9a Merge "Potential fix for receiver leak problem" into nyc-dev 2016-04-20 13:49:32 +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
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
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
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
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
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
TreeHugger Robot
40c228d989 Merge "Fixed AccessPreference listener." into nyc-dev 2016-04-19 18:41:06 +00:00
Victor Chang
f766cc8395 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
am: 04a01b7

* commit '04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I83917e8e6ecf29456a4559b3540e64540ddde144
2016-04-19 18:39:11 +00:00
Victor Chang
04a01b7cc7 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev 2016-04-19 18:29:16 +00:00
Jason Monk
7e62eef4ef Merge "Fix account screen in split screen" into nyc-dev
am: 43059b7

* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
  Fix account screen in split screen

Change-Id: I7e422356106307ef827f04a2147a7978bd6d81d6
2016-04-19 18:22:21 +00:00
Jason Monk
43059b7e7c Merge "Fix account screen in split screen" into nyc-dev 2016-04-19 18:09:27 +00:00
Noah Wang
9359e0f969 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev
am: 4f63bb6

* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: I0ed40edbd65890426f07e38a36369592b29ddb01
2016-04-19 18:07:08 +00:00