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
Andrew Sapperstein
30b566e7c6 Merge "Null check intent before starting "learn more"." into nyc-mr1-dev 
am: bc25322de8

* commit 'bc25322de81dd149e407f8eb9f9ecd90bc1394bc':
  Null check intent before starting "learn more".

Change-Id: I0ca8a07f16a3aa68a87796eb2c840fdbf468a363
 2016-05-03 19:45:50 +00:00
Jason Monk
3d4b3e768c Merge "Fix leaks" into nyc-dev am: ea8ee68507 
am: 065f27b14b

* commit '065f27b14bb99592a8aa9002d238b7f3ab031b69':

Change-Id: Ife8809f1749868c99af377611240ff46322e5e5a
 2016-05-03 19:45:07 +00:00
TreeHugger Robot
bc25322de8 Merge "Null check intent before starting "learn more"." into nyc-mr1-dev 2016-05-03 19:43:30 +00:00
Jason Monk
f239345b0c Merge "Fix leaks" into nyc-dev am: ea8ee68507 
am: 639ed29bae

* commit '639ed29bae86891616643d00ffe143639e9cbb41':
  Fix leaks

Change-Id: Ib37a585ad37575abe7ef04f3c7d4b3024210738e
 2016-05-03 19:42:19 +00:00
Jason Monk
639ed29bae Merge "Fix leaks" into nyc-dev 
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: Ibf93ffeda0bca5e554da3462647ba207d0f9653f
 2016-05-03 19:39:59 +00:00
Jason Monk
065f27b14b Merge "Fix leaks" into nyc-dev 
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
 2016-05-03 19:39:59 +00:00
Jason Monk
ea8ee68507 Merge "Fix leaks" into nyc-dev 2016-05-03 19:36:34 +00:00
Jason Monk
4e8d3013a2 Fix leaks 
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes: 28074995
 2016-05-03 15:24:05 -04:00
Jason Monk
68cfd43ad1 Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: bf96779cbf 
am: f681c515cd

* commit 'f681c515cdab554bf2eb39b81681d901dd055c80':

Change-Id: I52bdbb736c8dc2a58ab30870d7957615cd93a2fe
 2016-05-03 18:47:30 +00:00
Jason Monk
0d05f33739 Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: 508e93babd 
am: 22ac2b749a

* commit '22ac2b749a43bf61295571d20c3ecee7ca0d26d9':
  Try to fix receiver crash

Change-Id: I4304d0147a856ba6bd767836cb8588e146cf4c60
 2016-05-03 18:47:29 +00:00
Jason Monk
f681c515cd Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 
am: bf96779cbf

* commit 'bf96779cbf24603de712856d6b646e30586714d7':

Change-Id: I0e224054779528a95e4fdb0c3e5d53455584878b
 2016-05-03 18:45:41 +00:00
Jason Monk
22ac2b749a Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 
am: 508e93babd

* commit '508e93babdab9cde97721670bbcd0fbc4a5a1e28':
  Try to fix receiver crash

Change-Id: I9f839090a913905358283f15a6930446209078c4
 2016-05-03 18:44:38 +00:00
Michael Wright
b857952d57 Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: e71a6ac6cd 
am: 9a4e28a538

* commit '9a4e28a5389967133322c72a481104863337a3f7':

Change-Id: Ia066b7d68a6a46330cd4e62ed7bd9004105a0611
 2016-05-03 18:43:47 +00:00
Michael Wright
9d95f44205 Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: df824969af 
am: 8a2d933b58

* commit '8a2d933b58f60d7c295428c162057a09abe6e7de':
  Add subtext for default keyboard layout.

Change-Id: I7056e5bf83b5e3140df45c4d8b6b4b9cf0eedcc6
 2016-05-03 18:43:46 +00:00
Jason Monk
bf96779cbf Merge "Try to fix receiver crash" into nyc-dev 
am: 5a2d6800b6

* commit '5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
  Try to fix receiver crash

Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
 2016-05-03 18:42:10 +00:00
Jason Monk
508e93babd Merge "Try to fix receiver crash" into nyc-dev 
am: 5a2d6800b6

* commit '5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
  Try to fix receiver crash

Change-Id: I641c41d7833bb8104f722889c123d1fe2447f6e7
 2016-05-03 18:42:05 +00:00
Michael Wright
9a4e28a538 Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b 
am: e71a6ac6cd

* commit 'e71a6ac6cdcbca69a0f759211b8a08724b7701d8':

Change-Id: I5761dcceb05a7dea7e7d212fa7c7cf765be956d0
 2016-05-03 18:39:09 +00:00
Jason Monk
5a2d6800b6 Merge "Try to fix receiver crash" into nyc-dev 2016-05-03 18:37:24 +00:00
Michael Wright
8a2d933b58 Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b 
am: df824969af

* commit 'df824969af786598f951830bd6ec387606da316a':
  Add subtext for default keyboard layout.

Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
 2016-05-03 18:36:48 +00:00
Michael Wright
df824969af Merge "Add subtext for default keyboard layout." into nyc-dev 
am: 12c2c2538b

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
  Add subtext for default keyboard layout.

Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9
 2016-05-03 18:34:18 +00:00
Michael Wright
e71a6ac6cd Merge "Add subtext for default keyboard layout." into nyc-dev 
am: 12c2c2538b

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
  Add subtext for default keyboard layout.

Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
 2016-05-03 18:34:17 +00:00
Michael Wright
12c2c2538b Merge "Add subtext for default keyboard layout." into nyc-dev 2016-05-03 18:28:59 +00:00
Michael Wright
276cc4d8ed Add subtext for default keyboard layout. 
Bug: 27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
 2016-05-03 18:27:16 +00:00
Jason Monk
a8a029f8eb Try to fix receiver crash 
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes: 28554650
 2016-05-03 14:25:56 -04:00
Andrew Sapperstein
6561d4870f Null check intent before starting "learn more". 
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

BUG: 28381984
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
 2016-05-03 11:01:35 -07:00
Tony Mak
64f6d9896f Add managed profile setting page 
Bug: 28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
 2016-05-03 18:55:41 +01:00
Rachel Zhang
8088907360 Launch Help & Feedback 
Bug: 28139684
Bug: 28141203
Change-Id: I9853fa5fd789cd6404dddfd9b00b7dc3afe73d91
 2016-05-03 10:48:05 -07:00
Baligh Uddin
55ea25eff7 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours am: 5c4e2d741a -s ours 
am: f83c49d66f  -s ours

* commit 'f83c49d66f08dadd90850ffcf7a157e5b92f2513':

Change-Id: I0e89141dba753387a97fe5e95d8dc0877c6e7372
 2016-05-03 17:04:55 +00:00
Baligh Uddin
244f870d1f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad4773b774 -s ours 
am: 688225bea8  -s ours

* commit '688225bea85a5288597ae6471879000c45306781':
  Import translations. DO NOT MERGE

Change-Id: I451a826c2ae7aea9b625b96531920907703c4615
 2016-05-03 17:04:54 +00:00
Baligh Uddin
7405dbb9c5 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours am: 8c648f3fd5 -s ours 
am: 8a4276a2ab  -s ours

* commit '8a4276a2ab6f5db38c3c9b21d8f0aa3d321a8426':
  Import translations. DO NOT MERGE

Change-Id: Iedf970a73e6efb991c869a5ff791fd2b4b052be0
 2016-05-03 17:04:51 +00:00
Baligh Uddin
f83c49d66f Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours 
am: 5c4e2d741a  -s ours

* commit '5c4e2d741a296a7da00e94bafa70b191e9702fed':

Change-Id: Ia43a5b595a0807dfc59135010925f6254a2fe723
 2016-05-03 16:54:27 +00:00
Baligh Uddin
688225bea8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: ad4773b774  -s ours

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

Change-Id: Ia1afdb49580d23fbe60f22f458d169c62bea1e3b
 2016-05-03 16:54:25 +00:00
Baligh Uddin
8a4276a2ab Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours 
am: 8c648f3fd5  -s ours

* commit '8c648f3fd5b3dc776f52a72b4d248cfa0baba655':
  Import translations. DO NOT MERGE

Change-Id: I49326528232aaac98c1b6830bc35505ff86ccbfc
 2016-05-03 16:51:27 +00:00
Baligh Uddin
8c648f3fd5 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e6a875576f  -s ours

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

Change-Id: Ia280336dd979aee7c6faf76fc77bef275f2b6285
 2016-05-03 16:49:06 +00:00
Baligh Uddin
5c4e2d741a Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e6a875576f  -s ours

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

Change-Id: I54dbc26d0afdd735fb798eefd4eab6d3a3773aa1
 2016-05-03 16:49:04 +00:00
Baligh Uddin
ad4773b774 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-03 16:41:21 +00:00
Baligh Uddin
e6a875576f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 16:41:17 +00:00
Baligh Uddin
a8eb5a1611 Merge "Import translations. DO NOT MERGE" 2016-05-03 16:41:12 +00:00
Felipe Leme
f79c20500e Implemented onRestrictPowerChanged(). 
BUG: 28521946

Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
 2016-05-03 08:43:08 -07:00
Robin Lee
cdebe28c15 Add lockdownEnabled parameter to always-on VPN API 
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
 2016-05-03 13:27:05 +01:00
Baligh Uddin
0737787235 Import translations. DO NOT MERGE 
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
 2016-05-03 01:39:46 -07:00
Baligh Uddin
e118a96fd0 Import translations. DO NOT MERGE 
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
 2016-05-03 01:25:52 -07:00
Baligh Uddin
2741388fb6 Import translations. DO NOT MERGE 
Change-Id: If2bd78844cb256f0ae348be37369466f0deb01fe
Auto-generated-cl: translation import
 2016-05-03 00:30:42 -07:00
Philip P. Moltmann
5d5dc5b922 Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp 
am: 036e33402c

* commit '036e33402cb5eb03f5f15c40b070e17eeebbb0ec':

Change-Id: Icc5796dd3b760a82794815b21db1aeefc42ab948
 2016-05-02 23:35:48 +00:00
Philip P. Moltmann
adbc8ea870 Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp 
am: 171748e950

* commit '171748e9509aaf30e4fad0afbf8e81086f3c1408':

Change-Id: Ibd71bbc84bc02aa0e6b25956058c8c1079bb0119
 2016-05-02 23:35:47 +00:00
Philip P. Moltmann
be3718f2f8 Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: 0c71d3b5cf 
am: 6a2c269a4c

* commit '6a2c269a4c53e51ad72f96b8ecc64c91048e1acc':
  Read disk ID from intent

Change-Id: Id9c13a8dc72c11601d3309a28c4cd54a30494fff
 2016-05-02 23:35:46 +00:00
Android Build Merger (Role)
036e33402c Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp 2016-05-02 23:30:38 +00:00
Philip P. Moltmann
a8c168a478 Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 
am: fe99c4282e

* commit 'fe99c4282e8e8a057c9519b93640c09ffe8e628a':

Change-Id: Ice23b0a3c9fc625f378e9073bdd2c12f2b2e51a3
 2016-05-02 23:30:32 +00:00
Android Build Merger (Role)
171748e950 Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp 2016-05-02 23:29:55 +00:00
Philip P. Moltmann
a8616dbf5f Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 
am: fe99c4282e

* commit 'fe99c4282e8e8a057c9519b93640c09ffe8e628a':
  Read disk ID from intent

Change-Id: Ifb0d8f693059943f78e07ff90bec8b355998b23e
 2016-05-02 23:29:45 +00:00