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

27024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
ae876a2e4b Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 am: 063ae24 
am: dc1f7d7

* commit 'dc1f7d75841654b31e0c010c85478a92fed3312e':

Change-Id: I2bf4bfe75919e73c4ce48d044db260a17525cfd1
 2016-04-19 18:49:27 +00:00
Victor Chang
9c751b518f Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 am: f766cc8 
am: ad8d93c

* commit 'ad8d93ce4f50c5d91bc1df2cebffce1c85e34040':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I82a727d2c3f436f6292f6c7f4a12c5d0f7853bdb
 2016-04-19 18:49:26 +00:00
Victor Chang
dc1f7d7584 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 
am: 063ae24

* commit '063ae24903e47e6a4c1192d480e1dffa33be39c0':

Change-Id: I836a949927d865feedc1cc6076357c2d6b84eb76
 2016-04-19 18:46:26 +00:00
Victor Chang
ad8d93ce4f Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 
am: f766cc8

* commit 'f766cc83951fff0c26ca57b074693ef8a4775283':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: Iadbd090b2a15b91137e170b7a22827d7fb3293e0
 2016-04-19 18:42:48 +00:00
Jason Monk
0a8d0350b9 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 am: 7e62eef 
am: 3bd5600

* commit '3bd5600360531c45dc57c5826ecd7fb64efcf1d6':

Change-Id: I2e840f09bfe1cd701df07447172c91156229e671
 2016-04-19 18:41:38 +00:00
Jason Monk
0c0069fed1 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 am: 4619c9c 
am: 50d03f4

* commit '50d03f4f654e0ce900eaa4201c732eb6c8392cef':
  Fix account screen in split screen

Change-Id: I03a079678ddad2a0e9093e848621604b0992aaf6
 2016-04-19 18:41:36 +00:00
Victor Chang
063ae24903 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev 
am: 04a01b7

* commit '04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I4d4677536be0f30e0c46cd191fa6f9eea518960b
 2016-04-19 18:39:19 +00:00
Victor Chang
f766cc8395 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev 
am: 04a01b7

* commit '04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I83917e8e6ecf29456a4559b3540e64540ddde144
 2016-04-19 18:39:11 +00:00
Jason Monk
3bd5600360 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 
am: 7e62eef

* commit '7e62eef4eff6b25f146cacd584355678f11f8b99':

Change-Id: Ibd3440f753cab510c7db9b506b4fbc5e43828e67
 2016-04-19 18:31:38 +00:00
Jason Monk
50d03f4f65 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 
am: 4619c9c

* commit '4619c9cf4a37a510d646321eba670c831ee5f703':
  Fix account screen in split screen

Change-Id: I34a6c6f43a511212c851ace8e551e23c6d640832
 2016-04-19 18:29:40 +00:00
Victor Chang
04a01b7cc7 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev 2016-04-19 18:29:16 +00:00
Jason Monk
4619c9cf4a Merge "Fix account screen in split screen" into nyc-dev 
am: 43059b7

* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
  Fix account screen in split screen

Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
 2016-04-19 18:22:29 +00:00
Jason Monk
7e62eef4ef Merge "Fix account screen in split screen" into nyc-dev 
am: 43059b7

* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
  Fix account screen in split screen

Change-Id: I7e422356106307ef827f04a2147a7978bd6d81d6
 2016-04-19 18:22:21 +00:00
Noah Wang
324c3b9834 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 am: 9359e0f 
am: ff380b9

* commit 'ff380b9841f9ee3caff08e7a23fdbceaea0ec9a8':

Change-Id: I1221ee54c4fc1838275cf021cce054cd9513d94e
 2016-04-19 18:21:55 +00:00
Noah Wang
f2ff8893ff Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 am: 1c94e6d 
am: 0b420fd

* commit '0b420fdad1d020ed20effc6230378074b03f7547':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: I0e02bc9da6da571079ec560ab89a64c1283e8586
 2016-04-19 18:21:55 +00:00
Noah Wang
ff380b9841 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 
am: 9359e0f

* commit '9359e0f9691664df3ac9d74759ad4e90c38266e3':

Change-Id: Ie294eb37d3ef9e6d420b41f501d28c45f02e4bab
 2016-04-19 18:14:24 +00:00
Noah Wang
0b420fdad1 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 
am: 1c94e6d

* commit '1c94e6dd90288d16a1ea2b2d132f5b7e4c2f7ddc':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: If80159aeef6a321f7c278700db217b6491a9a3d4
 2016-04-19 18:11:09 +00:00
Jason Monk
43059b7e7c Merge "Fix account screen in split screen" into nyc-dev 2016-04-19 18:09:27 +00:00
Noah Wang
1c94e6dd90 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev 
am: 4f63bb6

* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: Ie9845c3f043d9fcb0733fe7204696b5792d8e9d9
 2016-04-19 18:07:20 +00:00
Noah Wang
9359e0f969 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev 
am: 4f63bb6

* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: I0ed40edbd65890426f07e38a36369592b29ddb01
 2016-04-19 18:07:08 +00:00
Jason Monk
74bd0c87be Fix account screen in split screen 
Don't remove all prefs in on pause, because why would you...

Change-Id: I9139dabf917b05860e738dc0b2aa19df8f983a7e
Fixes: 27987782
 2016-04-19 14:06:24 -04:00
Noah Wang
4f63bb69f5 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev 2016-04-19 17:56:50 +00:00
Fan Zhang
6fca010cd6 Merge "Request SupportFeatureProvider to provide a support tab." 2016-04-19 17:13:16 +00:00
Victor Chang
e8a46f2838 Remove reference to @string/ssl_ca_cert_dialog_title 
Bug: 28263186
Change-Id: I2e1c7d30d1fff49b2103acec90769edf4b61911b
 2016-04-19 17:47:58 +01:00
Fan Zhang
bd1c27ee1e Request SupportFeatureProvider to provide a support tab. 
Bug: 28139604

In dashboard container, if supportFeatureProvider is able to provide a
tab, we display it in tabbed layout. Otherwise, display just
DashboardSummary without changing UI.

Change-Id: Ib7601ac925e1315e6b0928d020fe2d09bd389cd7
 2016-04-19 08:30:20 -07:00
Jason Monk
693bb7fcb1 Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 9f6fcdf" into nyc-mr1-dev-plus-aosp 
am: 647e70f

* commit '647e70f5c12cdf860f01f12af6979c9634c0bc75':

Change-Id: I0ff29433507bbde2f8d48d64d6c243f09d252d79
 2016-04-19 13:57:28 +00:00
Jason Monk
2a4eba14fa Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 8379c3f 
am: fec910e

* commit 'fec910e998654eb523f9b61dbc0f14d1361b55a7':
  Guard against app info crash

Change-Id: I215b7d4928f3a0ba9c4f3d9ae08f367cba6a1ad2
 2016-04-19 13:57:28 +00:00
Android Build Merger (Role)
647e70f5c1 Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 9f6fcdf" into nyc-mr1-dev-plus-aosp 2016-04-19 13:51:11 +00:00
Jason Monk
5d124ea344 Merge "Guard against app info crash" into nyc-dev am: c3ab03e 
am: 9f6fcdf

* commit '9f6fcdf0d7cda838a9072f7c912fd5a5b6bb5129':
  Guard against app info crash

Change-Id: Iac16ff08c6fe12acbce8cb9ccf0401fcf2722690
 2016-04-19 13:51:02 +00:00
Jason Monk
fec910e998 Merge "Guard against app info crash" into nyc-dev am: c3ab03e 
am: 8379c3f

* commit '8379c3f603628ebcdfface78643e8fffe3fe08b8':
  Guard against app info crash

Change-Id: I4d5434eaa5770b6582878f5e593086e82e991eaf
 2016-04-19 13:51:01 +00:00
Jason Monk
8379c3f603 Merge "Guard against app info crash" into nyc-dev 
am: c3ab03e

* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
  Guard against app info crash

Change-Id: Id1cea6852ef79ddaafb79764c8c4c18cf077d0c5
 2016-04-19 13:45:31 +00:00
Jason Monk
9f6fcdf0d7 Merge "Guard against app info crash" into nyc-dev 
am: c3ab03e

* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
  Guard against app info crash

Change-Id: I313465d83efc950527b1634e2bc6609e6ea8e7cf
 2016-04-19 13:45:18 +00:00
Jason Monk
c3ab03ecdb Merge "Guard against app info crash" into nyc-dev 2016-04-19 13:38:38 +00:00
Zoltan Szatmary-Ban
96378672d0 Merge "Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: 9c8d099" into nyc-mr1-dev-plus-aosp 
am: b927b14

* commit 'b927b145afa85056d718fb7d3eb56ad08e06c0a2':

Change-Id: I2f7a110044e2ee2102f45f5f21e4c6214e17e213
 2016-04-19 13:38:35 +00:00
Zoltan Szatmary-Ban
f533314aad Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: f89218e 
am: c82afdc

* commit 'c82afdc5dc24d311b29bcbcc6889924d8b39ef2c':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: I13deb3633ef6c6606498f8152f6395c37a015f90
 2016-04-19 13:38:35 +00:00
Android Build Merger (Role)
b927b145af Merge "Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: 9c8d099" into nyc-mr1-dev-plus-aosp 2016-04-19 13:35:30 +00:00
Zoltan Szatmary-Ban
55460e3a7d Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 
am: 9c8d099

* commit '9c8d099f440abad2eacb150ebd225689cc87021e':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: I81895bb3e3e53229241f3673d6c71b070d9c639e
 2016-04-19 13:35:21 +00:00
Zoltan Szatmary-Ban
c82afdc5dc Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 
am: f89218e

* commit 'f89218e2812e702567d78aa5459cde1877d4c0e2':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ib9717c52c2c9356d81cb48cdf5e24f7a64ce35fd
 2016-04-19 13:35:20 +00:00
Zoltan Szatmary-Ban
f89218e281 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev 
am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ia7518fe9369e9f045ca120d1cb91ca81db0a5836
 2016-04-19 13:32:20 +00:00
Zoltan Szatmary-Ban
9c8d099f44 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev 
am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: I97559de43f49df91af5f8ef1c9a2bd6c968f7f0e
 2016-04-19 13:32:19 +00:00
Zoltan Szatmary-Ban
295f1060e9 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev 2016-04-19 13:25:22 +00:00
Abodunrinwa Toki
b7cff16cb6 Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: 5749a18" into nyc-mr1-dev-plus-aosp 
am: 44dea6c

* commit '44dea6cbc2781925e574fbb2e8c5e218b03c49e6':

Change-Id: Ic2bc148498c850fde004e7a75a02264829f9fbae
 2016-04-19 11:09:25 +00:00
Abodunrinwa Toki
0893f1f56b Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: f0fa52e 
am: 8d0c5fa

* commit '8d0c5fa82b4371902fee1aae21eb6839c7ba64a4':
  Input Settings: Change the 'add' icon.

Change-Id: I6f0bb57b943e7c5132de851c4484161d7b65cc6b
 2016-04-19 11:09:24 +00:00
Android Build Merger (Role)
44dea6cbc2 Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: 5749a18" into nyc-mr1-dev-plus-aosp 2016-04-19 11:06:20 +00:00
Abodunrinwa Toki
ea91db989b Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 
am: 5749a18

* commit '5749a18b8c0934dc727784dc6346a89379b7dcbf':
  Input Settings: Change the 'add' icon.

Change-Id: I12d2f6d99b91b1e4c283359cfb6eb866e259132b
 2016-04-19 11:06:11 +00:00
Abodunrinwa Toki
8d0c5fa82b Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 
am: f0fa52e

* commit 'f0fa52ea6824eac7cd961023b8fcc0cdde9e0c27':
  Input Settings: Change the 'add' icon.

Change-Id: I9d6c03250f8f7df566c1665c187d055c13ef4a26
 2016-04-19 11:06:10 +00:00
Abodunrinwa Toki
f0fa52ea68 Merge "Input Settings: Change the \'add\' icon." into nyc-dev 
am: 8aa7cf1

* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
  Input Settings: Change the 'add' icon.

Change-Id: Ic7d0870e1862a2ff378832b1600075d3aec6f059
 2016-04-19 11:03:17 +00:00
Abodunrinwa Toki
5749a18b8c Merge "Input Settings: Change the \'add\' icon." into nyc-dev 
am: 8aa7cf1

* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
  Input Settings: Change the 'add' icon.

Change-Id: I1f783e46cc86e1992bf345f900acc1dc720113dd
 2016-04-19 11:03:17 +00:00
Abodunrinwa Toki
8aa7cf1631 Merge "Input Settings: Change the 'add' icon." into nyc-dev 2016-04-19 10:56:35 +00:00
Keisuke Kuroyanagi
f9eb1c2c47 Merge "Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab am: 0ed84f4" into nyc-mr1-dev-plus-aosp 
am: 1101b8e

* commit '1101b8e85e25b5cfc9b48a341b7bbe359ee7a212':

Change-Id: I35f35e78b9025ea7879cc719de7b2a42222e8e93
 2016-04-19 04:27:05 +00:00