PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,231 Commits 1 Branch 0 Tags
7b0820bf82edcd565eaa005f56b361b186d51a1b
Commit Graph

27231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
d8b94d0dc3 Switch fragments to SettingsPreferenceFragment am: 019aad4c61 
am: 113762f1dc

* commit '113762f1dcf3afe84eb68d3bfae15cd3cd89f375':

Change-Id: Ibef663103ab5ad013e9906641a3f47b00af3c02e
 2016-05-11 14:15:22 +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
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
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
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
TreeHugger Robot
277b7a81bd Merge "Add list item to open tips & tricks." into nyc-mr1-dev 2016-05-10 20:31:09 +00:00
Jason Monk
0496ffad87 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a 
am: 4101ba4eb1

* commit '4101ba4eb1395988941f3f24bc2f502753036e2f':
  Make sure TileAdapter always has a SuggestionParser

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

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

Change-Id: I4dd252b002a96c9ae7b91e3ee5aba0c9ad7b57b7
 2016-05-10 20:29:02 +00:00
Jason Monk
4101ba4eb1 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev 
am: a50a14a23a

* commit 'a50a14a23a4f57203d01489ddef607f46f485518':
  Make sure TileAdapter always has a SuggestionParser

Change-Id: I484e3d7ec30276538ec2a9176eb529f9e2d839b0
 2016-05-10 20:26:28 +00:00
Sudheer Shanka
e869494be1 Merge "Update the visibility state of views in UserPreference properly." into nyc-dev 
am: a3b2bdc144

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

Change-Id: I9ddab9b11526da4f0d4c7912b7ba4992b2e1306b
 2016-05-10 20:26:27 +00:00
Jason Monk
6e9867dcc9 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev 
am: a50a14a23a

* commit 'a50a14a23a4f57203d01489ddef607f46f485518':
  Make sure TileAdapter always has a SuggestionParser

Change-Id: I87ee80fa989079c554c60870b9ddc70d3b36c5e4
 2016-05-10 20:26:22 +00:00
Sudheer Shanka
a9cadaa52a Merge "Update the visibility state of views in UserPreference properly." into nyc-dev 
am: a3b2bdc144

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

Change-Id: I911765978cd757441ba8f6c2e9c83a61b2754ca4
 2016-05-10 20:26:22 +00:00
Jason Monk
a50a14a23a Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev 2016-05-10 20:23:16 +00:00
Sudheer Shanka
a3b2bdc144 Merge "Update the visibility state of views in UserPreference properly." into nyc-dev 2016-05-10 20:14:25 +00:00
Jason Monk
8c44f06443 Fix crash on rotate pointer speed 
Change-Id: Ie87b0343f153957d7c7129a04690af20361f9063
Fixes: 28641237
 2016-05-10 15:41:30 -04:00
Andrew Sapperstein
49db9c38b5 Add list item to open tips & tricks. 
Added to the more help list for now.

BUG: 28654701
Change-Id: Ia020c3ffb5ab42cb82ffa75834fa45d20f2a1e72
 2016-05-10 12:08:47 -07:00
Android Build Merger (Role)
9b1a3d9960 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de -s ours am: 172b04e468 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-10 18:19:02 +00:00
Android Build Merger (Role)
3fc386f676 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-10 18:18:54 +00:00
Baligh Uddin
c4cfab5239 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de -s ours 
am: 172b04e468  -s ours

* commit '172b04e468583fc7c29970b1ca6aa90f69c1e713':

Change-Id: I480d61a4ba7c9033b31cc4dd1daa11e483812928
 2016-05-10 18:18:37 +00:00
Baligh Uddin
6f3299f22e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 94f982c1d1  -s ours

* commit '94f982c1d13de9185cc80e62ce15b52e1f9ed6c2':
  Import translations. DO NOT MERGE

Change-Id: I3043a31e7be0ef5dc2d66633c563028fb18c2cdf
 2016-05-10 18:18:36 +00:00
Android Build Merger (Role)
ce437f6f71 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-10 18:16:17 +00:00
Baligh Uddin
1d3b7a05bf Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 94f982c1d1  -s ours

* commit '94f982c1d13de9185cc80e62ce15b52e1f9ed6c2':
  Import translations. DO NOT MERGE

Change-Id: Iefddd701fc442d989d7c55e5db590d0194cb14e3
 2016-05-10 18:15:58 +00:00
Baligh Uddin
289801bf42 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de -s ours 
am: 994fbea737  -s ours

* commit '994fbea737718ccc47b83467a1e75027ff327228':
  Import translations. DO NOT MERGE

Change-Id: Iab066dbe7473df8047edec1eac2440483cbf4035
 2016-05-10 18:15:52 +00:00