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

27086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Adrian Roos
e7b9a582e7 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: 3b8cc35b4a

* commit '3b8cc35b4ae79b6bbf0d7793b35df10f830d06f2':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I777028cb4d4b7120c538edc35928f1508743308f
 2016-05-02 15:25:12 +00:00
Adrian Roos
c14a9af008 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 
am: 820d7c85c7

* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
 2016-05-02 15:21:02 +00:00
Adrian Roos
3b8cc35b4a Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 
am: 820d7c85c7

* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I1ce852a59674583c5dd2e67eeb79a4419ec15cda
 2016-05-02 15:21:02 +00:00
Adrian Roos
820d7c85c7 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 2016-05-02 15:13:40 +00:00
Philip P. Moltmann
2fc2eb49a9 Read disk ID from intent 
mDisk might be null, but we can recover the disk ID from the original
Intent.

Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
 2016-04-29 16:35:28 -07:00
Maurice Lam
4d227268c6 Remove top padding only if illustration is present 
Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
 2016-04-29 15:07:40 -07:00