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
Sudheer Shanka
262148ecbd Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 am: 28c44ebf65 
am: 755e6676bc

* commit '755e6676bc572687fce771e0dab78c303b7c2535':

Change-Id: I23afd320cb29f624bc24246c571be08776ff9709
 2016-05-11 21:52:05 +00:00
Sudheer Shanka
f3d130aab9 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 am: eeeb02fefb 
am: 6c3bff4930

* commit '6c3bff493095ffd1f768c1cac159fc112c3fd351':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: Ie6f897b89986f7e1dcb59a1ceced3ce6ba4ae2a8
 2016-05-11 21:51:48 +00:00
Sudheer Shanka
755e6676bc Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 
am: 28c44ebf65

* commit '28c44ebf65f1d0602b5956a328c1f2886ad92fd3':

Change-Id: Id2feb9a5b493ed2e1a86c6d7911ef4c726c8df8e
 2016-05-11 19:34:14 +00:00
Sudheer Shanka
6c3bff4930 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 
am: eeeb02fefb

* commit 'eeeb02fefbb8d8e3dbe70a8862cf21ac9ac55736':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I46f14c2de931a132cc27bc678293f9e028812758
 2016-05-11 19:22:24 +00:00
Sudheer Shanka
eeeb02fefb Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev 
am: 938501cf76

* commit '938501cf7634843460b03b6fe954e927166e1257':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I2aa5788fa98cf5ac128c161fcb0123b26eae1d7b
 2016-05-11 19:14:11 +00:00
Sudheer Shanka
28c44ebf65 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev 
am: 938501cf76

* commit '938501cf7634843460b03b6fe954e927166e1257':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0
 2016-05-11 19:13:46 +00:00
Sudheer Shanka
938501cf76 Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev 2016-05-11 19:04:20 +00:00
Jason Monk
095ba6a3bd Merge "Fix unmount up button" into nyc-dev am: 7680871d92 am: d88d281304 
am: 78f6921e1f

* commit '78f6921e1f60d5001ca8ee97f718cc2efaba110c':

Change-Id: I6a903fa80bc389848cb5b218d811d341be501c27
 2016-05-11 18:29:13 +00:00
Maurice Lam
e4d0b818fe Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e am: 96aaeafa91 
am: 3a31510fcd

* commit '3a31510fcd0b1ad37a29a8495f1cb98a969cc658':

Change-Id: I3f735d8fa63b7e54153339f46215d8ca477ed43f
 2016-05-11 18:29:01 +00:00
Jason Monk
b1e1e9a9fc Merge "Fix unmount up button" into nyc-dev am: 7680871d92 am: 29b86d10d5 
am: 60c6b9d252

* commit '60c6b9d252c6bab3a9a662c614a241784a9f616c':
  Fix unmount up button

Change-Id: I91a6ace7eb4da5deb21c02c581bf96c8344041dc
 2016-05-11 18:28:38 +00:00
Maurice Lam
22a31ae79d Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e -s ours am: ac97181cbc 
am: 7610ed23bd

* commit '7610ed23bd54ef534b1b035b48e213bfcae8cf8d':
  Fix truncated text in pattern lock setup

Change-Id: I8c11ee000471dc555c4ad489d1561b94536f3d4c
 2016-05-11 18:27:39 +00:00
Jason Monk
78f6921e1f Merge "Fix unmount up button" into nyc-dev am: 7680871d92 
am: d88d281304

* commit 'd88d2813043075ad470898f0a053bd04a46bbe8d':

Change-Id: I52319c8d01a6a91d30f632554c24d52b5c1dd277
 2016-05-11 18:23:49 +00:00
Maurice Lam
3a31510fcd Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e 
am: 96aaeafa91

* commit '96aaeafa91f5702ec4c9d630465e03c8c56f4dd9':

Change-Id: I56dee241a7c696464ce0386ee3385327578075d1
 2016-05-11 18:23:43 +00:00
Jason Monk
60c6b9d252 Merge "Fix unmount up button" into nyc-dev am: 7680871d92 
am: 29b86d10d5

* commit '29b86d10d519a1a1620f42b83a0766246e286409':
  Fix unmount up button

Change-Id: Ic666811fad5ed0b5512e9904d46158f61aee819a
 2016-05-11 18:21:09 +00:00
Maurice Lam
7610ed23bd Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e -s ours 
am: ac97181cbc

* commit 'ac97181cbc2e8b980f8cc9dd6615d38faff61dc7':
  Fix truncated text in pattern lock setup

Change-Id: I5e12f0bd4e7353842d681fe306eb2816d4f332cf
 2016-05-11 18:21:02 +00:00
Jason Monk
29b86d10d5 Merge "Fix unmount up button" into nyc-dev 
am: 7680871d92

* commit '7680871d92cd9fa31a3f515d112767644745f26e':
  Fix unmount up button

Change-Id: I4c803b0664abd85956b724b782820920dced6a31
 2016-05-11 18:18:37 +00:00
Maurice Lam
ac97181cbc Merge "Fix truncated text in pattern lock setup" into nyc-dev 
am: 353cdee69e  -s ours

* commit '353cdee69e492f4571025644009024e3a1b10898':
  Fix truncated text in pattern lock setup

Change-Id: I3fb29ac80ad857c15128b14076f0c2bf79375ea1
 2016-05-11 18:18:19 +00:00
Jason Monk
d88d281304 Merge "Fix unmount up button" into nyc-dev 
am: 7680871d92

* commit '7680871d92cd9fa31a3f515d112767644745f26e':
  Fix unmount up button

Change-Id: I5384e051aa9409b07af2a201f17244e91360003e
 2016-05-11 18:15:38 +00:00
Maurice Lam
96aaeafa91 Merge "Fix truncated text in pattern lock setup" into nyc-dev 
am: 353cdee69e

* commit '353cdee69e492f4571025644009024e3a1b10898':
  Fix truncated text in pattern lock setup

Change-Id: I470a2267b051eb394ed95f9c7443786fbf911836
 2016-05-11 18:15:35 +00:00
Jason Monk
7680871d92 Merge "Fix unmount up button" into nyc-dev 2016-05-11 18:04:57 +00:00
Maurice Lam
353cdee69e Merge "Fix truncated text in pattern lock setup" into nyc-dev 2016-05-11 18:04:26 +00:00
Jason Monk
0aed68d6b9 Fix unmount up button 
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes: 28704198
 2016-05-11 13:53:13 -04:00
Jason Monk
43a597b1a7 Merge "Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 2134be3239" into nyc-mr1-dev-plus-aosp 
am: 322938b234

* commit '322938b2340b4ef7fae28b913057dfe964c7ceb4':

Change-Id: Id8ebbffc87af1179980e2f64759b75cee3c665ab
 2016-05-11 16:34:01 +00:00
Jason Monk
5df096c381 Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 3b533b98da 
am: 779584976c

* commit '779584976c66e9836ea676c6b1a75ef43953920a':
  Fix crash in not installed for this user apps

Change-Id: Ie4bd362867be447d5565d6084c8d638c6c11df29
 2016-05-11 16:34:01 +00:00
Android Build Merger (Role)
322938b234 Merge "Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 2134be3239" into nyc-mr1-dev-plus-aosp 2016-05-11 16:31:36 +00:00
Jason Monk
779584976c Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f 
am: 3b533b98da

* commit '3b533b98da67909c66448db99f4e7d239adf2f15':
  Fix crash in not installed for this user apps

Change-Id: I29e5a40715d9d6f5a767fbdfdb46535bf67b23a7
 2016-05-11 16:31:25 +00:00
Jason Monk
df8932b95b Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f 
am: 2134be3239

* commit '2134be3239197f6ebc7372bacf5b1d8f2d49a516':
  Fix crash in not installed for this user apps

Change-Id: I50183afac2db30ac8f0d94b201d44c013469e794
 2016-05-11 16:31:25 +00:00
Jason Monk
2134be3239 Merge "Fix crash in not installed for this user apps" into nyc-dev 
am: a188b2447f

* commit 'a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
  Fix crash in not installed for this user apps

Change-Id: I177bc82e5d9848b9981a6ce0b1948094ae19d420
 2016-05-11 16:28:48 +00:00
Jason Monk
3b533b98da Merge "Fix crash in not installed for this user apps" into nyc-dev 
am: a188b2447f

* commit 'a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
  Fix crash in not installed for this user apps

Change-Id: I98f79dc9c4cb315259c2057fc852237111495051
 2016-05-11 16:28:48 +00:00
Jason Monk
a188b2447f Merge "Fix crash in not installed for this user apps" into nyc-dev 2016-05-11 16:19:04 +00:00
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