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
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
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
Android Build Merger (Role)
b876efea97
Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 3f53bdb" into nyc-mr1-dev-plus-aosp
2016-04-20 14:02:25 +00:00
Jason Monk
9bb25af646
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289
...
am: 523f522
2016-04-20 14:02:16 +00:00
Jason Monk
304235ea7d
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289
...
am: 3f53bdb
2016-04-20 14:02:15 +00:00
Jason Monk
3f53bdb8a3
Merge "Potential fix for receiver leak problem" into nyc-dev
...
am: 623a289
2016-04-20 13:59:42 +00:00
Jason Monk
523f5228d4
Merge "Potential fix for receiver leak problem" into nyc-dev
...
am: 623a289
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
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
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
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
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
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
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
2016-04-20 00:14:13 +00:00
Daichi Hirono
1a7aa2654f
Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
...
am: ef5285e3f6
2016-04-20 00:14:11 +00:00
Daichi Hirono
ef5285e3f6
Merge "Add nullcheck to StorageSettings." into nyc-dev
...
am: 0e048a11c7
2016-04-20 00:12:03 +00:00
Daichi Hirono
4362396184
Merge "Add nullcheck to StorageSettings." into nyc-dev
...
am: 0e048a11c7
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
yifan.bai
198b92d037
resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp
...
am: d2477357e8
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
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
Udam Saini
29a04c05a5
Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
...
am: 2620e24
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
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
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
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
TreeHugger Robot
63e39411ea
Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
...
am: 9a22ccd
2016-04-19 19:01:39 +00:00
TreeHugger Robot
51ea751ff5
Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
...
am: c838707
2016-04-19 18:59:31 +00:00
Felipe Leme
9a22ccde2f
Merge "Fixed AccessPreference listener." into nyc-dev
...
am: 40c228d
2016-04-19 18:59:26 +00:00
Victor Chang
dc1f7d7584
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7
...
am: 063ae24
2016-04-19 18:46:26 +00:00
