Jason Monk
5d8c95d931
Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64
...
am: fcc592c6ac
2016-04-21 16:00:25 +00:00
Jason Monk
fcc592c6ac
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
2016-04-21 15:58:01 +00:00
Jason Monk
80f32e1dce
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
2016-04-21 15:58:00 +00:00
Jason Monk
ac663d2ff5
Screen saver string fixes
...
Change-Id: I609509787e5f7f9f03eb0e478ab358fe930b0678
Fixes: 28268243
2016-04-21 11:50:58 -04:00
Tony Mak
7655be05c1
New UI to hint user about strong auth
...
Instead of having a separate textview, we now reuse the detail textview
to show the hint.
Fix: 28204828
Change-Id: I3eff3240bf7ecb1495fbf11a073a273a0de603ae
2016-04-21 10:27:43 +01:00
Udam Saini
36461ab4fd
Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 am: be21812
...
am: 8e9323b840
2016-04-21 03:27:07 +00:00
Jason Monk
642603419e
Merge "Remove some of the unused assets" into nyc-dev am: 8b8002b am: 1a49ebc
...
am: 1c7415767b
2016-04-21 03:27:00 +00:00
Ruben Brunk
af29fad670
Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110 am: 0db43e4
...
am: df317dba47
2016-04-21 03:26:55 +00:00
Sudheer Shanka
1bc6452083
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am: c2dae39 am: 14aa458
...
am: a711612c35
2016-04-21 03:26:52 +00:00
Sudheer Shanka
8e22c9366b
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a am: c80d630
...
am: 391878a328
2016-04-21 03:26:48 +00:00
Jason Monk
97f31d2942
Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc am: 040acf7
...
am: 36a3081447
2016-04-21 03:26:43 +00:00
Udam Saini
8e9323b840
Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1
...
am: be21812
2016-04-20 21:44:15 +00:00
TreeHugger Robot
1c7415767b
Merge "Remove some of the unused assets" into nyc-dev am: 8b8002b
...
am: 1a49ebc
2016-04-20 21:44:14 +00:00
Fan Zhang
9fc57d0eba
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
...
am: 01f1779
2016-04-20 21:44:14 +00:00
Ruben Brunk
df317dba47
Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110
...
am: 0db43e4
2016-04-20 21:44:13 +00:00
Sudheer Shanka
a711612c35
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am: c2dae39
...
am: 14aa458
2016-04-20 21:44:12 +00:00
Sudheer Shanka
391878a328
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a
...
am: c80d630
2016-04-20 21:44:10 +00:00
Jason Monk
36a3081447
Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc
...
am: 040acf7
2016-04-20 21:44:08 +00:00
Andrew Sapperstein
b0c58aa530
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
...
am: 12344c5
2016-04-20 21:43:58 +00:00
Udam Saini
f21a205ff3
Merge "Fixes a string for tablets/devices" into nyc-dev
...
am: e0892e1
2016-04-20 21:42:22 +00:00
Jason Monk
e29e622b4e
Merge "Remove some of the unused assets" into nyc-dev
...
am: 8b8002b
2016-04-20 21:42:22 +00:00
Ruben Brunk
a72edfb23d
Merge "Add settings for altering VR display behavior." into nyc-dev
...
am: 3a3d110
2016-04-20 21:42:20 +00:00
Sudheer Shanka
122b781d3a
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
...
am: c2dae39
2016-04-20 21:42:20 +00:00
Sudheer Shanka
5a80da4bd1
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
...
am: b2f161a
2016-04-20 21:42:19 +00:00
Jason Monk
a60e5b52d8
Merge "Daydream -> Screen saver" into nyc-dev
...
am: ea80ebc
2016-04-20 21:42:18 +00:00
Udam Saini
be21812827
Merge "Fixes a string for tablets/devices" into nyc-dev
...
am: e0892e1
2016-04-20 21:04:30 +00:00
Udam Saini
e0892e16ad
Merge "Fixes a string for tablets/devices" into nyc-dev
2016-04-20 20:54:41 +00:00
Fan Zhang
01f177982d
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
2016-04-20 20:50:17 +00:00
Jason Monk
1a49ebc1af
Merge "Remove some of the unused assets" into nyc-dev
...
am: 8b8002b
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
Ruben Brunk
0db43e44d0
Merge "Add settings for altering VR display behavior." into nyc-dev
...
am: 3a3d110
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
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
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
2016-04-20 18:02:35 +00:00
Jason Monk
040acf7dab
Merge "Daydream -> Screen saver" into nyc-dev
...
am: ea80ebc
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
1ecc1f69b8
Daydream -> Screen saver
...
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
2016-04-20 13:39:18 -04:00
Clara Bayarri
b4d55a2050
Remove Secure Startup option from Security Settings
...
Bug: 27440560
Change-Id: Iff700e4e759aea88f8e71f1fdff1837962f84a92
2016-04-20 15:02:44 +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
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
Noah Wang
f2ff8893ff
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 am: 1c94e6d
...
am: 0b420fd
2016-04-19 18:21:55 +00:00
Noah Wang
1c94e6dd90
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
2016-04-19 18:07:20 +00:00
Noah Wang
4f63bb69f5
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
2016-04-19 17:56:50 +00:00
