PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,573 Commits 1 Branch 0 Tags
b058ba1eb1bf26c8ac1cbf092ea320b07aa9554c
Commit Graph

28573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
d52a01da30 Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34 am: 8b4fad811a 
am: 7b0820bf82

* commit '7b0820bf82edcd565eaa005f56b361b186d51a1b':

Change-Id: I9c1831ff87c51afa85c2599d2a9c53a034ee1361
 2016-05-11 15:37:40 +00:00
Jason Monk
58a561e1e6 Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34 am: b98fd15589 
am: 637729e246

* commit '637729e246247bfe8913bb8632517600d97ddf60':
  Expose dialog for current webview setting.

Change-Id: I7bebdd5905b574f8100e10bbcee263fd3b1ff662
 2016-05-11 15:37:39 +00:00
Jason Monk
7b0820bf82 Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34 
am: 8b4fad811a

* commit '8b4fad811a316f72241ee369e313498a51c7b524':

Change-Id: I7a286fec20c8971a23273f914201cecf6d72211f
 2016-05-11 15:35:21 +00:00
Jason Monk
637729e246 Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34 
am: b98fd15589

* commit 'b98fd15589ef0d95108104b0b5dea66e3dca4578':
  Expose dialog for current webview setting.

Change-Id: If4c1e7f93bdae4c0ed284dff2365cd614c671fcd
 2016-05-11 15:35:00 +00:00
Jason Monk
8b4fad811a Merge "Expose dialog for current webview setting." into nyc-dev 
am: f9e62e8d34

* commit 'f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
  Expose dialog for current webview setting.

Change-Id: I6c80311b6c8b3e552d6a479d20e0e5d4748e67a6
 2016-05-11 15:33:31 +00:00
Jason Monk
bde1a7cfb1 Fix crash in not installed for this user apps 
Change-Id: I96fa409c5a91cdb6758dbf81714c1c97e28f47b6
Fixes: 28637871
 2016-05-11 11:33:04 -04:00
Jason Monk
b98fd15589 Merge "Expose dialog for current webview setting." into nyc-dev 
am: f9e62e8d34

* commit 'f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
  Expose dialog for current webview setting.

Change-Id: Icc624a2ad85a3e119fa5a9893fa89d02e3773b51
 2016-05-11 15:32:47 +00:00
Jason Monk
f9e62e8d34 Merge "Expose dialog for current webview setting." into nyc-dev 2016-05-11 15:27:37 +00:00
Jason Monk
958b569325 Merge "Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8 am: 9137eca497" into nyc-mr1-dev-plus-aosp 
am: 54d2530ad2

* commit '54d2530ad2c69caa3556bc2e3f8435157a79fe7b':

Change-Id: I54b54b166e39e045dbec1addaa49cbbfd16a0790
 2016-05-11 15:21:30 +00:00
Jason Monk
5c2a9d336b Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8 am: f241ae5fcf 
am: 2a5b456e69

* commit '2a5b456e69e029f101769e8465afc50939254780':
  Protect against case when suggestions haven't loaded

Change-Id: I085ab8cdb6650457ebc552afdb5218a3fe37ce0a
 2016-05-11 15:21:29 +00:00
Jason Monk
7519954286 Expose dialog for current webview setting. 
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes: 28554048
 2016-05-11 11:20:55 -04:00
Android Build Merger (Role)
54d2530ad2 Merge "Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8 am: 9137eca497" into nyc-mr1-dev-plus-aosp 2016-05-11 15:19:01 +00:00
Jason Monk
2a5b456e69 Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8 
am: f241ae5fcf

* commit 'f241ae5fcfdefd3b5ddb294c41f84c7deb6ef836':
  Protect against case when suggestions haven't loaded

Change-Id: I784e069f98d348a1897891b61c1053af63b18dae
 2016-05-11 15:18:45 +00:00
Jason Monk
6315a61bbf Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8 
am: 9137eca497

* commit '9137eca497a70cb1f8af27b40e270b46cf51176f':
  Protect against case when suggestions haven't loaded

Change-Id: I3b92a44a2595707413ee384b486e603c01cdac19
 2016-05-11 15:18:43 +00:00
Jason Monk
9137eca497 Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev 
am: 76f95e82b8

* commit '76f95e82b861441bccb9f452fe77e1c47acc1d3c':
  Protect against case when suggestions haven't loaded

Change-Id: Ia3da0b1f72ccd51c3c3d06839ff8a91e25b1479a
 2016-05-11 15:16:02 +00:00
Jason Monk
f241ae5fcf Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev 
am: 76f95e82b8

* commit '76f95e82b861441bccb9f452fe77e1c47acc1d3c':
  Protect against case when suggestions haven't loaded

Change-Id: Ie0bc3aa3e696efcec5560860284b457e636bd5bc
 2016-05-11 15:16:01 +00:00
Jason Monk
76f95e82b8 Merge "Protect against case when suggestions haven't loaded" into nyc-dev 2016-05-11 15:06:05 +00:00
Jason Monk
31ecec0ab1 Protect against case when suggestions haven't loaded 
Change-Id: I7668ed8af3f1808b619f0fdbd77c2f85da98f607
Fixes: 28691636
 2016-05-11 11:01:17 -04:00
Victor Chang
5eab96f90d Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: e8c5eca02d am: 38e54ae400 
am: bfde7153b6

* commit 'bfde7153b6d26194b94524ee8f057c5d7cadb04a':

Change-Id: Ifc8d19c190a1f798ff76b9c441c11378af98a9f9
 2016-05-11 14:58:38 +00:00
Victor Chang
5ef004f76b Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: e8c5eca02d am: bf513e27ae 
am: ee7ef743f5

* commit 'ee7ef743f59973119071ba805f46dc30e379fdef':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: If88024ceb0dc30a1f9e9767d924e1c9bd978adc3
 2016-05-11 14:58:37 +00:00
Victor Chang
bfde7153b6 Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: e8c5eca02d 
am: 38e54ae400

* commit '38e54ae400fa27ef1813bf668aedb297b525e702':

Change-Id: Ia2cf207c4b239465e03546f8c05e960d31077dea
 2016-05-11 14:55:31 +00:00
Victor Chang
ee7ef743f5 Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: e8c5eca02d 
am: bf513e27ae

* commit 'bf513e27aec0295b8b99d45dd9d100709cff7f1f':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: Ic5d3dd6f04449ecbc36b4a5069b161159e340759
 2016-05-11 14:54:44 +00:00
Victor Chang
bf513e27ae Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 
am: e8c5eca02d

* commit 'e8c5eca02dab28c7c3860660c9cc8d890ee5a638':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: I033215096d347e4216fa55b913c8e612e0cb6496
 2016-05-11 14:52:03 +00:00
Victor Chang
38e54ae400 Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 
am: e8c5eca02d

* commit 'e8c5eca02dab28c7c3860660c9cc8d890ee5a638':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: Ife7faac27689a9c364486930d1ecb5ed4cf741c0
 2016-05-11 14:52:02 +00:00
Victor Chang
e8c5eca02d Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 2016-05-11 14:43:14 +00:00
Jason Monk
e2c926d3e8 Switch fragments to SettingsPreferenceFragment am: 019aad4c61 am: 113762f1dc 
am: d8b94d0dc3

* commit 'd8b94d0dc3f7e5c836108604b57d88bd756fab7a':

Change-Id: Ib2b6fecb8cf6a58a4713042933a1ddf052aedc08
 2016-05-11 14:17:25 +00:00
Jason Monk
d8b94d0dc3 Switch fragments to SettingsPreferenceFragment am: 019aad4c61 
am: 113762f1dc

* commit '113762f1dcf3afe84eb68d3bfae15cd3cd89f375':

Change-Id: Ibef663103ab5ad013e9906641a3f47b00af3c02e
 2016-05-11 14:15:22 +00:00
Jason Monk
df7e87206a Switch fragments to SettingsPreferenceFragment am: 019aad4c61 am: 7b1c5657d5 
am: 5dc650fe2d

* commit '5dc650fe2d15925c730309ee548d65a0d59abe18':
  Switch fragments to SettingsPreferenceFragment

Change-Id: I9677dff172af93eb129d3ad7f88698e2a15fa1cd
 2016-05-11 14:14:33 +00:00
Jason Monk
5dc650fe2d Switch fragments to SettingsPreferenceFragment am: 019aad4c61 
am: 7b1c5657d5

* commit '7b1c5657d59db95ff968f665f9fd8a8654771757':
  Switch fragments to SettingsPreferenceFragment

Change-Id: I9e5bd85e99d2accd53b5cb40195bc2f7d03ac2bc
 2016-05-11 14:11:54 +00:00
Jason Monk
113762f1dc Switch fragments to SettingsPreferenceFragment 
am: 019aad4c61

* commit '019aad4c61da0b358782bc3cc59cc2688bb84a39':
  Switch fragments to SettingsPreferenceFragment

Change-Id: I108eb329457335ddeb2d79d7bd494fefbcc8d742
 2016-05-11 14:11:30 +00:00
Jason Monk
7b1c5657d5 Switch fragments to SettingsPreferenceFragment 
am: 019aad4c61

* commit '019aad4c61da0b358782bc3cc59cc2688bb84a39':
  Switch fragments to SettingsPreferenceFragment

Change-Id: I15c83cbcda1a8936f8944addd4d6e65ef47415fe
 2016-05-11 14:09:51 +00:00
Victor Chang
01f4dbcc1c Fix ConfirmCredential is not presented before trusting cert installed by PO/DO 
- Show ConfirmCredential in TrustedCredentialsSettings when Trust button is clicked
  for the very first time since the activity launched
- Warning activity (work mode off, crpyto-aware) should not be shown when the activity is started. Also fixed it here.

Bug: 28619980
Change-Id: I084b70883c087376e437a9ad3238d7c3313a0a17
 2016-05-11 15:05:21 +01:00
Jason Monk
019aad4c61 Switch fragments to SettingsPreferenceFragment 
So all basic settings features are supported properly

Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes: 28634520
 2016-05-11 10:00:55 -04:00
Jason Monk
1b2281fded Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41 am: 7cdfe9a6d8 
am: f019d2df6b

* commit 'f019d2df6b43d35745abbf57d61559b9fb5184dc':

Change-Id: Icde7c4660b790dfb65d46e0ef6ebc62b3fd364f3
 2016-05-11 13:54:21 +00:00
Jason Monk
e1b9ad424c Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41 am: b88e4899ff 
am: 93fc24535b

* commit '93fc24535b7dc1ecd6e1200d148afed4f70d0b00':
  Fix crash on rotate pointer speed

Change-Id: Ib53059eed143a57eec48c82ce08b5050167e3578
 2016-05-11 13:54:20 +00:00
Jason Monk
f019d2df6b Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41 
am: 7cdfe9a6d8

* commit '7cdfe9a6d8c8cbdced15bb1001ef0912424ad27c':

Change-Id: Ibb845db7176f6a46205f24d9734bce599b8675d2
 2016-05-11 13:52:15 +00:00
Jason Monk
93fc24535b Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41 
am: b88e4899ff

* commit 'b88e4899ffd6daa9d27cb42ddeae6afa3cfad111':
  Fix crash on rotate pointer speed

Change-Id: I2431d97095b0a5011a2de512d9fdba04836bf1b3
 2016-05-11 13:49:45 +00:00
Jason Monk
b88e4899ff Merge "Fix crash on rotate pointer speed" into nyc-dev 
am: ab30931d41

* commit 'ab30931d4156afb8ee56c8df3b48fad4703712a7':
  Fix crash on rotate pointer speed

Change-Id: Id1745575e2210352ef4f4799e8a787f69ebe9b70
 2016-05-11 13:46:45 +00:00
Jason Monk
7cdfe9a6d8 Merge "Fix crash on rotate pointer speed" into nyc-dev 
am: ab30931d41

* commit 'ab30931d4156afb8ee56c8df3b48fad4703712a7':
  Fix crash on rotate pointer speed

Change-Id: I6c73b33e8da5260240c7b6a549151da95c926164
 2016-05-11 13:46:42 +00:00
Jason Monk
ab30931d41 Merge "Fix crash on rotate pointer speed" into nyc-dev 2016-05-11 13:36:53 +00:00
Felipe Leme
c3534bb963 Removed onRestrictPowerChanged(). 
BUG: 28521946

Change-Id: Ib48030c704cf38541101b600b1e91935302beb9c
 2016-05-10 23:21:29 +00:00
Andrew Sapperstein
ac384f47c5 Merge "Add list item to open tips & tricks." into nyc-mr1-dev am: 277b7a81bd 
am: ebe454e32a

* commit 'ebe454e32af92ec37bf9dd6413378443e2645f5e':
  Add list item to open tips & tricks.

Change-Id: Ia7dac06f485b5ce5191e3952737824c96f8d1989
 2016-05-10 22:06:15 +00:00
Jason Monk
2d501ebc4b Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a am: 6e9867dcc9 
am: ce00f641e6

* commit 'ce00f641e6371b41614f171ddaeceffe5b81f825':

Change-Id: Id05d1d52f82fe1cc4d10bccc742a4ce97eb5015e
 2016-05-10 22:06:14 +00:00
Sudheer Shanka
b40c51c950 Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144 am: a9cadaa52a 
am: 062bf2708b

* commit '062bf2708b15b70ae08f3313f554a8b89eb62ece':

Change-Id: I369f61e24ecad5ce19ab57bd35a78c7be4742d56
 2016-05-10 22:06:13 +00:00
Andrew Sapperstein
ebe454e32a Merge "Add list item to open tips & tricks." into nyc-mr1-dev 
am: 277b7a81bd

* commit '277b7a81bdf4e5c9147dbb430f875c7f80e4e0e1':
  Add list item to open tips & tricks.

Change-Id: I765b9f356c24c654ff08192ef3ed0bc582b24a59
 2016-05-10 20:44:56 +00:00
Jason Monk
2e2f19d2eb resolve merge conflicts of 0496ffa to master 
Change-Id: I61589b7e9f1190e19d48dbb421541ebc2891ee82
 2016-05-10 16:34:48 -04:00
Jason Monk
ce00f641e6 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a 
am: 6e9867dcc9

* commit '6e9867dcc9766d3f14627b34ee4b74531062681a':

Change-Id: Ifa40dcf509d5a70d2058d0255dfc21a8945cffe5
 2016-05-10 20:31:51 +00:00
Sudheer Shanka
062bf2708b Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144 
am: a9cadaa52a

* commit 'a9cadaa52ad53ec130c4a635f0d18f79e01618a4':

Change-Id: I236318d8c9f854a9d4d79dfb21f21b625635a99a
 2016-05-10 20:31:50 +00:00
Sudheer Shanka
fec0c1b1c7 Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144 am: e869494be1 
am: a4b264132a

* commit 'a4b264132aec094ceabce54f8ccd02024120da0d':
  Update the visibility state of views in UserPreference properly.

Change-Id: I38757b48bf8efef27a34e4c0b338bf6ae5abbcf0
 2016-05-10 20:31:34 +00:00
TreeHugger Robot
277b7a81bd Merge "Add list item to open tips & tricks." into nyc-mr1-dev 2016-05-10 20:31:09 +00:00