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

28021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Monk
2e2f19d2eb resolve merge conflicts of 0496ffa to master 
Change-Id: I61589b7e9f1190e19d48dbb421541ebc2891ee82
 2016-05-10 16:34:48 -04: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
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
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
Baligh Uddin
105f6d919a Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de -s ours am: 172b04e468 -s ours" into nyc-mr1-dev-plus-aosp 
am: 9b1a3d9960  -s ours

* commit '9b1a3d996039032a456bb4b0bd3c8d98f4df59f4':

Change-Id: Ie80139f50bac582667406a79ec054481c2d6edf0
 2016-05-10 18:27:22 +00:00
Baligh Uddin
e23d238cce Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1 -s ours" into nyc-mr1-dev-plus-aosp 
am: 3fc386f676  -s ours

* commit '3fc386f6765d09fdcbb61f7f487c75ea560754d2':

Change-Id: I4f24d984b192cf857b2ae3b90fada8cab0ee14f8
 2016-05-10 18:27:21 +00:00
Baligh Uddin
69d6fd5f0f Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1 -s ours" into nyc-mr1-dev-plus-aosp 
am: ce437f6f71  -s ours

* commit 'ce437f6f718c872bc299217ab3e77d6d0c622188':
  Import translations. DO NOT MERGE

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

* commit '289801bf42f753d783dc1c143e3d03f611e5cad9':
  Import translations. DO NOT MERGE

Change-Id: Ia3f8ccef2a33bdaa61c3d1551839849bca46ecc7
 2016-05-10 18:27:17 +00: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
Daniel Nishi
769774a4dd resolve merge conflicts of b59dbf6 to master 
Change-Id: I6ef5cd4bae9ff67a5b5367b291a14731e5b871eb
 2016-05-10 11:17:28 -07: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
Baligh Uddin
994fbea737 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7efa4cc6de  -s ours

* commit '7efa4cc6deedd3e5a3443b294698be1c007e25e1':
  Import translations. DO NOT MERGE

Change-Id: Iaf9d94c6a18930c8080da0d30cee8a093052f667
 2016-05-10 18:13:00 +00:00
Baligh Uddin
172b04e468 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7efa4cc6de  -s ours

* commit '7efa4cc6deedd3e5a3443b294698be1c007e25e1':
  Import translations. DO NOT MERGE

Change-Id: Ie703cc9ee56a69091d7f570f0a9f07101469f330
 2016-05-10 18:13:00 +00:00
Baligh Uddin
09a63a42f0 Merge "Import translations. DO NOT MERGE" 2016-05-10 18:05:45 +00:00
Baligh Uddin
7efa4cc6de Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-10 18:05:44 +00:00
Baligh Uddin
94f982c1d1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-10 18:05:40 +00:00
Daniel Nishi
b59dbf632f Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev 
am: 7961077e3a

* commit '7961077e3acdbb7dc0648b5ce7314adb504de0bf':
  Create an overlay to add a photo and video deletion helper service.

Change-Id: Ied44ae1ae3c26ebf010a95afe8897e04e25b28e3
 2016-05-10 17:57:50 +00:00
Daniel Nishi
7961077e3a Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev 2016-05-10 17:50:21 +00:00
Daniel Nishi
38889de699 Create an overlay to add a photo and video deletion helper service. 
This overlay defines a checkbox preference in the deletion helper for
facilitating the deletion of photos and videos. The service which
provides deletion clearing can be overridden and used to create a
custom photo and video deletion helper.

Bug: 28554187
Bug: 28560856

Change-Id: Id5d9671a307aaac0d1331f055b8f2ab7aa67977c
 2016-05-10 10:48:59 -07:00
Jason Monk
fe0865bd47 Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b am: a69387df1d 
am: ced0768d49

* commit 'ced0768d490ac5e6ee0b24f99a33b453ee2e78c6':

Change-Id: I2ce88a96f4e8ff0b7afe74294905c4b1a93ab053
 2016-05-10 17:46:51 +00:00
Jason Monk
77a19385e3 Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b am: 75a09c1db9 
am: 08358a899a

* commit '08358a899abc4cd7b40ce81ba68e63d7797b9f23':
  Fix label loading on default home setting

Change-Id: I8ca957720f11b9fd099681daf118634a6d9c9838
 2016-05-10 17:44:10 +00:00
Jason Monk
ced0768d49 Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b 
am: a69387df1d

* commit 'a69387df1d594823becfa129a72960264c487c31':

Change-Id: I28a37469abea63baf11909d048921a058eb8f333
 2016-05-10 17:44:00 +00:00
Jason Monk
08358a899a Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b 
am: 75a09c1db9

* commit '75a09c1db9e9a441d4678171b921431fc629ee94':
  Fix label loading on default home setting

Change-Id: I923fbaa7095ed4c5fcda4f8e9f56e508af7b976c
 2016-05-10 17:40:57 +00:00
Baligh Uddin
37bd336595 Import translations. DO NOT MERGE 
Change-Id: I433f23d9ad9b6831b6a94c5f13dde7fa9e521c3b
Auto-generated-cl: translation import
 2016-05-10 10:39:45 -07:00
Jason Monk
75a09c1db9 Merge "Fix label loading on default home setting" into nyc-dev 
am: cbf2ccbe1b

* commit 'cbf2ccbe1b60fc5958faf7be4f01b775ad2a1d9a':
  Fix label loading on default home setting

Change-Id: Idaa6dcdf870bf19bcee6b9696b62dbafeeb3465a
 2016-05-10 17:38:24 +00:00
Jason Monk
a69387df1d Merge "Fix label loading on default home setting" into nyc-dev 
am: cbf2ccbe1b

* commit 'cbf2ccbe1b60fc5958faf7be4f01b775ad2a1d9a':
  Fix label loading on default home setting

Change-Id: I086223f35c7eadd2e1eea61067d1bfd194512aad
 2016-05-10 17:38:22 +00:00
Jason Monk
cbf2ccbe1b Merge "Fix label loading on default home setting" into nyc-dev 2016-05-10 17:34:09 +00:00
Hyunyoung Song
ee6f8c6fe5 Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev am: 6f2771623f 
am: 0e9f297027

* commit '0e9f29702754228bfa1041160d333a379075ef1a':
  Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771.

Change-Id: If1505cf2e041fe7a41a245f8ce7895af7883da09
 2016-05-10 17:33:13 +00:00
Baligh Uddin
41f959d2c1 Import translations. DO NOT MERGE 
Change-Id: I0d63c7faea233cf237002dddebb4fb96a3ecae18
Auto-generated-cl: translation import
 2016-05-10 10:31:18 -07:00
Hyunyoung Song
0e9f297027 Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev 
am: 6f2771623f

* commit '6f2771623f3a93d51ad075c476ca9b538c0d44e6':
  Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771.

Change-Id: I04623fcec7e8046c7a5e905e09261d5c9e550018
 2016-05-10 17:30:20 +00:00
Hyunyoung Song
6f2771623f Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev 2016-05-10 17:21:48 +00:00
Hyunyoung Song
1e51aa507d Revert "Add shortcut manager support to Settings (2/2) b/28298258" 
b/28643184
This reverts commit 79ec6df771.

Change-Id: I3de8a27e88a5a84825e914725259530b22756da0
 2016-05-10 17:16:33 +00:00
Jason Monk
a41a8d05ab Make sure TileAdapter always has a SuggestionParser 
Since it expects to have one

Change-Id: Ic0dccd2271c011cf7dc877e341af5a8bfea90c37
Fixes: 28689801
 2016-05-10 13:03:35 -04:00
Jason Monk
96be611e16 Fix label loading on default home setting 
Change-Id: Ia7d00eaf48eb703b766c760b6140ea98be5490f1
Fixes: 28668320
 2016-05-10 12:47:37 -04:00
Baligh Uddin
8b2d53fac8 Import translations. DO NOT MERGE 
Change-Id: I5b2fb61af1c7f717718b89ac01237fd8af1d8d71
Auto-generated-cl: translation import
 2016-05-10 09:33:57 -07:00
Victor Chang
dc4027eb7d Merge "Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe am: 5296dbca73" into nyc-mr1-dev-plus-aosp 
am: 254e0b3b3f

* commit '254e0b3b3f1c487f024fec372630542f2f2919a1':

Change-Id: Id6c4ffc82427afd109897b3ac7c943e9e772009c
 2016-05-10 14:50:47 +00:00
Victor Chang
e622c66052 Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe am: 5ffcedbae9 
am: f906f3c24a

* commit 'f906f3c24a711e02ed17fa0ebf1aa7dc024fabdf':
  Show a different Root CA string for device owner

Change-Id: Ida47ae23f8ab6ec97a9535b2e4e2bbcf7673dd03
 2016-05-10 14:50:46 +00:00
Android Build Merger (Role)
254e0b3b3f Merge "Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe am: 5296dbca73" into nyc-mr1-dev-plus-aosp 2016-05-10 14:43:02 +00:00