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

28101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Victor Chang
94c75422da Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe 
am: 5296dbca73

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

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

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

Change-Id: I2b939b8fbbff30b3fef67a334d06c5ee19e901ea
 2016-05-10 14:42:47 +00:00
Victor Chang
5296dbca73 Merge "Show a different Root CA string for device owner" into nyc-dev 
am: 9c31684bbe

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

Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1
 2016-05-10 14:35:53 +00:00
Victor Chang
5ffcedbae9 Merge "Show a different Root CA string for device owner" into nyc-dev 
am: 9c31684bbe

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

Change-Id: I85745e298c2e141f55446c8f0460f4745b1b8767
 2016-05-10 14:35:53 +00:00
Victor Chang
9c31684bbe Merge "Show a different Root CA string for device owner" into nyc-dev 2016-05-10 14:29:39 +00:00
Felipe Leme
369db9b21f Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf am: 2318d40fc3 
am: 00696bbe40

* commit '00696bbe4077b88494491dbdad697a0cb3826fb5':

Change-Id: I2c67634e59561758a89fbc10b4539cd9c4be8ddf
 2016-05-09 20:18:18 +00:00
Felipe Leme
4ae532c728 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf am: 2af22b9324 
am: 542a348f75

* commit '542a348f75c239111ce64b01a8d7afc844f4c194':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: I512d7130837b5cd346ff4b7cdc13013496f84149
 2016-05-09 20:18:16 +00:00
Felipe Leme
00696bbe40 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf 
am: 2318d40fc3

* commit '2318d40fc32643a431502b5b9633674c16f363ac':

Change-Id: I066be3582b1c22ca3c84e6350e0e1fd4eeb2878e
 2016-05-09 20:14:04 +00:00
Felipe Leme
542a348f75 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf 
am: 2af22b9324

* commit '2af22b9324cefed224c65d2b91b2245246f50552':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: I5847f67777f723e7e9c06c0e120dfedb414f40c6
 2016-05-09 20:11:16 +00:00
Felipe Leme
2af22b9324 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev 
am: 8c3b5fa3cf

* commit '8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: If2d8f9673af0150d8a2a10aa0d0f9de0c17f4161
 2016-05-09 20:05:42 +00:00
Felipe Leme
2318d40fc3 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev 
am: 8c3b5fa3cf

* commit '8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: Ifb78da77b270aab297ba67037a85a37cc26a769a
 2016-05-09 20:05:38 +00:00
Fan Zhang
bc4118c849 Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 am: 3bfe967e5c" into nyc-mr1-dev-plus-aosp 
am: 80c8bbd004

* commit '80c8bbd00449e1d26874c8b6b3f644b648e3e550':

Change-Id: Id97548fd6e31066a4326486f754cf9b01e5ec463
 2016-05-09 19:58:58 +00:00
Fan Zhang
34c1f09b05 Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 am: 8f834a10e0 
am: 0638e943d5

* commit '0638e943d5b7a31390e3cef835affa40895dcccb':
  Fix crash when rotating screen in a few screens.

Change-Id: Idff4d69f9618a193712e4a9f2d17646a3b461585
 2016-05-09 19:58:58 +00:00
Android Build Merger (Role)
80c8bbd004 Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 am: 3bfe967e5c" into nyc-mr1-dev-plus-aosp 2016-05-09 19:53:50 +00:00
Fan Zhang
03a626b750 Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 
am: 3bfe967e5c

* commit '3bfe967e5cab5ddd3d14cebdfd07075d48577082':
  Fix crash when rotating screen in a few screens.

Change-Id: I238c48dfa3e78f1c42f4f96de88afb33ab28761d
 2016-05-09 19:53:39 +00:00
Fan Zhang
0638e943d5 Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 
am: 8f834a10e0

* commit '8f834a10e083df651a3f003e248d58eaacae99ce':
  Fix crash when rotating screen in a few screens.

Change-Id: I62a625e0a51e6adda598aa911125a65484358155
 2016-05-09 19:53:38 +00:00
TreeHugger Robot
8c3b5fa3cf Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev 2016-05-09 19:50:11 +00:00
Fan Zhang
8f834a10e0 Merge "Fix crash when rotating screen in a few screens." into nyc-dev 
am: 2728874605

* commit '2728874605ef6dc19c901c39663d04c7087e8cda':
  Fix crash when rotating screen in a few screens.

Change-Id: Ie31ea933c19597c73b5454fe944dca751435550e
 2016-05-09 19:48:22 +00:00
Fan Zhang
3bfe967e5c Merge "Fix crash when rotating screen in a few screens." into nyc-dev 
am: 2728874605

* commit '2728874605ef6dc19c901c39663d04c7087e8cda':
  Fix crash when rotating screen in a few screens.

Change-Id: I5fa56a9910016e76d30a845fa4578f07eb2229e5
 2016-05-09 19:48:22 +00:00
Fan Zhang
2728874605 Merge "Fix crash when rotating screen in a few screens." into nyc-dev 2016-05-09 19:39:58 +00:00
Bill Yi
79734661e3 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea -s ours am: 7cebc5dbda -s ours 
am: 424103ed15  -s ours

* commit '424103ed15f40993792af786af71171034196e42':

Change-Id: Idb2c36ed37200fe297eb88c122b230c154bf336a
 2016-05-09 18:44:05 +00:00