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
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
Philip P. Moltmann
6a2c269a4c Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 
am: 0c71d3b5cf

* commit '0c71d3b5cfbe14bb531ce3c94838ec84ef84d96b':
  Read disk ID from intent

Change-Id: I3854c5c6f17789e5bdfa16b5c4c7ff9ca635b4d1
 2016-05-02 23:29:43 +00:00
Philip P. Moltmann
0c71d3b5cf Merge "Read disk ID from intent" into nyc-dev 
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
 2016-05-02 23:24:05 +00:00
Philip P. Moltmann
fe99c4282e Merge "Read disk ID from intent" into nyc-dev 
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4
 2016-05-02 23:24:05 +00:00
Philip P. Moltmann
e0e7fa4501 Merge "Read disk ID from intent" into nyc-dev 2016-05-02 23:00:30 +00:00
Sudheer Shanka
1eaaee41af Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a am: 000293cbb9 
am: 4fe4ff0efb

* commit '4fe4ff0efbecfd6a06fe7049fd71df86a34c0c48':

Change-Id: Iaa84c1cb436b5aebecfe0f819ea5a118e9f10357
 2016-05-02 20:34:00 +00:00
Sudheer Shanka
4fe4ff0efb Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a 
am: 000293cbb9

* commit '000293cbb962faf0defc294e0903617085ac45b4':

Change-Id: Ib0c380158917dfd24233e06faea8ab1c241f326b
 2016-05-02 20:23:09 +00:00
Sudheer Shanka
7f5cc819b7 Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a am: 0814dfbccb 
am: 1d7972ebaa

* commit '1d7972ebaa4c3fd468271b0df9a684a9c152bb21':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I6cf133d62a197efea479404b22a36acdaf440f16
 2016-05-02 20:22:59 +00:00
Sudheer Shanka
1d7972ebaa Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a 
am: 0814dfbccb

* commit '0814dfbccb5bff8a7cbf2c60d8b835d7207a3b45':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I315ecc2c7583ea17e56861a1b2b78b5bdf07a7e1
 2016-05-02 20:17:21 +00:00
Sudheer Shanka
0814dfbccb Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev 
am: 57e6a9144a

* commit '57e6a9144a0577308bd9888f3498c17ca96e4f5f':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I348e39f6519c3d620b7f3a3cba6eca72118339a9
 2016-05-02 20:09:59 +00:00
Sudheer Shanka
000293cbb9 Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev 
am: 57e6a9144a

* commit '57e6a9144a0577308bd9888f3498c17ca96e4f5f':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I078516706896910eeee3e86b525e96cdf807aa1b
 2016-05-02 20:09:58 +00:00
Sudheer Shanka
57e6a9144a Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev 2016-05-02 20:00:45 +00:00
Maurice Lam
87b9c14176 Merge "Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: ec3fec5f94" into nyc-mr1-dev-plus-aosp 
am: e03e92503d

* commit 'e03e92503db35cd7ea96e78da27f27eadc3b5e74':

Change-Id: I030e837f2f416f908bc7e08efb34773650265a78
 2016-05-02 18:14:58 +00:00
Maurice Lam
2d33647a8a Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: 0f27a312b7 
am: 114ce05d7f

* commit '114ce05d7f2c487dccf0098440375e2865756c68':
  Remove top padding only if illustration is present

Change-Id: Ie16353f5d99034be57a070b07f8023c6382555cb
 2016-05-02 18:14:57 +00:00
Android Build Merger (Role)
e03e92503d Merge "Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: ec3fec5f94" into nyc-mr1-dev-plus-aosp 2016-05-02 18:10:37 +00:00
Maurice Lam
6319330d73 Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 
am: ec3fec5f94

* commit 'ec3fec5f94c5429433a1dd7c87cb40cd6a035efb':
  Remove top padding only if illustration is present

Change-Id: Ie08a1d1ef54e32af85b5d3d312e6d5563ab3a822
 2016-05-02 18:10:21 +00:00
Maurice Lam
114ce05d7f Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 
am: 0f27a312b7

* commit '0f27a312b7f8dd94443d8ccedc7e9e0debf49e3d':
  Remove top padding only if illustration is present

Change-Id: I88243769eecf9a4ba373bc48bd40cca4308c626a
 2016-05-02 18:10:09 +00:00
Maurice Lam
0f27a312b7 Merge "Remove top padding only if illustration is present" into nyc-dev 
am: 0e4816efb9

* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
  Remove top padding only if illustration is present

Change-Id: I0b92a87785df54ca66427a4e3871f0ed4737b55f
 2016-05-02 18:05:27 +00:00
Maurice Lam
ec3fec5f94 Merge "Remove top padding only if illustration is present" into nyc-dev 
am: 0e4816efb9

* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
  Remove top padding only if illustration is present

Change-Id: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
 2016-05-02 18:05:23 +00:00
Maurice Lam
0e4816efb9 Merge "Remove top padding only if illustration is present" into nyc-dev 2016-05-02 17:58:10 +00:00
Fan Zhang
c217ec8ef7 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev am: ac74071630 
am: e0fc6404a3

* commit 'e0fc6404a3b0d3858451f9e65efbf805fbc32740':
  Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4196227ac087bcadfec1a20f969edc7dba2016b5
 2016-05-02 17:09:39 +00:00
Fan Zhang
e0fc6404a3 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev 
am: ac74071630

* commit 'ac7407163096e3a743e95d452a1d9675d17734b9':
  Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4845a410b7c8a79d9f7e83e6216bb75044c4fae5
 2016-05-02 17:05:46 +00:00
Fan Zhang
ac74071630 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev 2016-05-02 16:57:12 +00:00
Fan Zhang
9502163f92 Explicitly setAccount in the same way as setHasInternet. 
Bug: 28141203

This frees adapter from updating account and internet internally, and
allows refreshData() be private.

Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee
 2016-05-02 09:24:59 -07:00
Adrian Roos
65731da3da Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp 
am: 85a16e6ca9

* commit '85a16e6ca9900c48dd3a6588230c418bc8b2cb9b':

Change-Id: I6795f46dd3496555efd3120d11c96a68f6e0dd29
 2016-05-02 15:29:23 +00:00
Adrian Roos
0006559b69 Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp 
am: d0b92c27f6

* commit 'd0b92c27f6e19e6318471527774052414b37581f':

Change-Id: Iacfa6b929a6ec76a8500d2a2f00a377ad2536f20
 2016-05-02 15:29:22 +00:00
Adrian Roos
0f07c96c61 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: 3b8cc35b4a 
am: e7b9a582e7

* commit 'e7b9a582e7d13881ec39199b5a457bf467d8d99d':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I15eda9892b43b2d835c8a938ccdc7fc297b91a56
 2016-05-02 15:29:21 +00:00
Android Build Merger (Role)
85a16e6ca9 Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp 2016-05-02 15:26:11 +00:00
Adrian Roos
a06e1991ac Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: c14a9af008

* commit 'c14a9af0082efdab768a46d0de82cfdbbeb97d3c':

Change-Id: I40a3e59abcc38e11102e93b2e4c40daca0d23eda
 2016-05-02 15:26:03 +00:00
Android Build Merger (Role)
d0b92c27f6 Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp 2016-05-02 15:25:23 +00:00
Adrian Roos
04ec73db5d Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: c14a9af008

* commit 'c14a9af0082efdab768a46d0de82cfdbbeb97d3c':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I449720787279e53eca1e8a413519ba8fa71202ed
 2016-05-02 15:25:13 +00:00