Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,402 Commits 1 Branch 0 Tags
0886bf22716d6e0501b6a5cb7bc202a01e2df875
Commit Graph

22244 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Jason Monk
9cc4a117ef Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 523f522 
am: 9bb25af

* commit '9bb25af64652c40de3a96b993810f61f6b5b6697':
  Potential fix for receiver leak problem

Change-Id: I1f0ef0c093637e9b954e52138198e558223a83d5
 2016-04-20 14:08:20 +00: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
9bb25af646 Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 
am: 523f522

* commit '523f5228d44cb0a5670fe085bb13ed4217e4e027':
  Potential fix for receiver leak problem

Change-Id: If393c4b4d814aab5f1eb4e0b08c2e5ac1b88bba1
 2016-04-20 14:02:16 +00:00
Jason Monk
3f53bdb8a3 Merge "Potential fix for receiver leak problem" into nyc-dev 
am: 623a289

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

Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
 2016-04-20 13:59:42 +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
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
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
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
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
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
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
Amit Mahajan
d2477357e8 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp 
Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc
 2016-04-19 16:15:56 -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
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
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
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
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
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
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
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
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
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
Victor Chang
063ae24903 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: I4d4677536be0f30e0c46cd191fa6f9eea518960b
 2016-04-19 18:39:19 +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
4619c9cf4a Merge "Fix account screen in split screen" into nyc-dev 
am: 43059b7

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

Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
 2016-04-19 18:22:29 +00: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

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

Change-Id: I0e02bc9da6da571079ec560ab89a64c1283e8586
 2016-04-19 18:21:55 +00:00