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
Jason Monk
6b421dd4f6 Merge "Default payment settings to disabled" into nyc-dev 2016-04-28 12:56:46 +00:00
Wei Wang
e2c8a97dd8 Merge "Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: ec8b526" into nyc-mr1-dev-plus-aosp 
am: 9dae2a3

* commit '9dae2a32bfcac39e02e85633a5e2b9ec9a109da7':

Change-Id: I2e7018100678cefad80ac1c0a8d100c4fe3dd0a2
 2016-04-28 06:09:12 +00:00
Wei Wang
2745712539 Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: aee68e0 
am: d780b1b

* commit 'd780b1b4e13c68d6fe762dad24a980a733be552a':
  Add an entry in developer options for location tools.

Change-Id: I687415fa5383dc1965b1e4b0d3a0948a6e554714
 2016-04-28 06:09:11 +00:00
Android Build Merger (Role)
9dae2a32bf Merge "Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: ec8b526" into nyc-mr1-dev-plus-aosp 2016-04-28 06:06:26 +00:00
Wei Wang
d780b1b4e1 Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a 
am: aee68e0

* commit 'aee68e029a37e7a18d8086e27ae1bf1bc6c33da1':
  Add an entry in developer options for location tools.

Change-Id: I97963a037f35ca3dd0db22ed5d6ff086acb5f912
 2016-04-28 06:06:14 +00:00
Wei Wang
31591c784f Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a 
am: ec8b526

* commit 'ec8b526fd045c3ff5f4d729088482786fa47ea1b':
  Add an entry in developer options for location tools.

Change-Id: I4677643929dc29d15c317b1f51af83c9837a40b8
 2016-04-28 06:06:13 +00:00
Wei Wang
ec8b526fd0 Merge "Add an entry in developer options for location tools." into nyc-dev 
am: 920cf0a

* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
  Add an entry in developer options for location tools.

Change-Id: I5af67764994e4cfed9f8ef4243954260d48ae163
 2016-04-28 06:03:17 +00:00
Wei Wang
aee68e029a Merge "Add an entry in developer options for location tools." into nyc-dev 
am: 920cf0a

* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
  Add an entry in developer options for location tools.

Change-Id: Ie48ad7a27367353e50d0dc021c2f36eebf04af77
 2016-04-28 06:03:16 +00:00
Wei Wang
920cf0a7b3 Merge "Add an entry in developer options for location tools." into nyc-dev 2016-04-28 05:57:30 +00:00
Adrian Roos
11638436c9 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c am: 9103fbb 
am: e9bcd23

* commit 'e9bcd233c962da1c7610c26442be949bfead45ef':

Change-Id: Ide7722f6fe561360ea25218a5854578edaaf112f
 2016-04-28 01:48:10 +00:00
Adrian Roos
ea81145fa3 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c am: 54994aa 
am: e75063b

* commit 'e75063b87b324d9c78f1a46fa09dde2466fef898':
  Fix crash when recreating SecuritySubSettings

Change-Id: Id96edf75f19cb1fcc0f696dccc8b081d2b7cd213
 2016-04-28 01:48:10 +00:00
TreeHugger Robot
e9bcd233c9 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c 
am: 9103fbb

* commit '9103fbb8379d436462fe095ac195a22a08ec7a5e':

Change-Id: Ia3d888aa2520572ba0b7a72d98d36a3a5853c8db
 2016-04-28 00:19:16 +00:00
TreeHugger Robot
e75063b87b Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c 
am: 54994aa

* commit '54994aaf4cb24ce59d13418bca0b4d9ce5747596':
  Fix crash when recreating SecuritySubSettings

Change-Id: I4a4cb36ac2a1b7aafecbdaa3ae447c5f9382db49
 2016-04-28 00:01:08 +00:00
Adrian Roos
54994aaf4c Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I09565a64acedc59c0e83b63d5d0974ba133ede87
 2016-04-27 23:45:11 +00:00
TreeHugger Robot
17723160c3 Merge "Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 am: 040b2ed" into nyc-mr1-dev-plus-aosp 
am: 17fc846

* commit '17fc8464f8bdf3d72ee52adb8db815fe47b54301':

Change-Id: I24304abec5cd8a707150524622b4437e4db57261
 2016-04-27 23:43:32 +00:00
Felipe Leme
06c9bdc168 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 am: e9f4fe7 
am: dbaaa26

* commit 'dbaaa26bf39fb299ee40de1ce554321e03628aa0':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I0ed635218e73da7e6bda54915e57e600f0a881e4
 2016-04-27 23:43:32 +00:00
Fan Zhang
1f8aea56f0 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev am: cd89d12 
am: 8d52417

* commit '8d52417257160443c2d52afa9d74c8406f0c7515':
  Monitor connectivity change and display offline promo.

Change-Id: Ib8b034b739f7048e788fa4b292ec291143ffe629
 2016-04-27 23:43:31 +00:00
Daniel Nishi
613ef6f696 Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev am: 883c214 
am: 35eb879

* commit '35eb879739daa0026c463494e71e525d58f5397f':
  Fix a Deletion Helper crash when it fails to get an app list.

Change-Id: Ia1e3499093808bdb795f4288b53c6235a5965e21
 2016-04-27 23:43:31 +00:00
Bill Yi
35698ad1ba Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20 -s ours am: 1e21b15 -s ours 
am: 81c4223  -s ours

* commit '81c42238e00dc8a6c0664904bf02508d9f31517b':

Change-Id: Id2ca8edecef249734da73868bb978d0e0f9d88e1
 2016-04-27 23:43:30 +00:00
Adrian Roos
9103fbb837 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I677d0025a9dfbb6afe7ad340d1a6e57daab5ab98
 2016-04-27 22:52:56 +00:00
Wei Wang
e1c1a13cba Add an entry in developer options for location tools. 
This is a temporary place holder for location dogfood tools, which will
be removed before ship.

Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8
 2016-04-27 15:51:19 -07:00
TreeHugger Robot
aee8d8c7e1 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 2016-04-27 22:40:05 +00:00
Android Build Merger (Role)
17fc8464f8 Merge "Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 am: 040b2ed" into nyc-mr1-dev-plus-aosp 2016-04-27 21:38:24 +00:00
TreeHugger Robot
4e97e16d87 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 
am: 040b2ed

* commit '040b2ed9b2a7c792879e908d67c90b3d15be5136':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I8947109fda1bfc4b6c77b79f77fe84ff72f8019e
 2016-04-27 21:38:16 +00:00
TreeHugger Robot
dbaaa26bf3 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18 
am: e9f4fe7

* commit 'e9f4fe7c4db589a022a886fe1c24c5098e9071e1':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I749e4b3c113dcc706112da6fee07decb443a5c6a
 2016-04-27 21:38:13 +00:00
Felipe Leme
e9f4fe7c4d Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: If77ecd7bc909fcd7af17a02aaa99061e4f242cad
 2016-04-27 21:31:53 +00:00
Felipe Leme
040b2ed9b2 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I5a8bce52f789a274ca1fc7cff1fb130072f9e0c4
 2016-04-27 21:31:51 +00:00
TreeHugger Robot
a21ac18b05 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 2016-04-27 21:15:59 +00:00
Fan Zhang
8d52417257 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 
am: cd89d12

* commit 'cd89d1264227fccd9fe72acc78d959ff17196f69':
  Monitor connectivity change and display offline promo.

Change-Id: I72ce587dba5ffb9e821658e10415a5d5ffad7e5d
 2016-04-27 21:01:00 +00:00
Daniel Nishi
35eb879739 Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev 
am: 883c214

* commit '883c2141eb4e03992a11f3a447c97845ab34048c':
  Fix a Deletion Helper crash when it fails to get an app list.

Change-Id: I7728f81d30bebf447624c0305f772d4be1e97588
 2016-04-27 21:00:59 +00:00
Adrian Roos
3686ef5e03 Fix crash when recreating SecuritySubSettings 
Restoring instance state requires the items to be
there after onCreate.

Change-Id: Icef92bcbb168a0b4029a86b2b74235e344e2055e
Fixes: 27013071
 2016-04-27 13:58:23 -07:00
Fan Zhang
cd89d12642 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 2016-04-27 20:42:38 +00:00
Bill Yi
81c42238e0 Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20 -s ours 
am: 1e21b15  -s ours

* commit '1e21b15db1d9fdcbacbee7b336327e69a8f57ae4':

Change-Id: I176bff105a47e4f27e2f82957a96752c6a68f45d
 2016-04-27 20:38:21 +00:00
Jason Monk
6b75f94b13 Default payment settings to disabled 
Since it requires some hardware to be enabled.

Change-Id: I6d2a244211cb4c1fa7aadb76e5c2e4ff7459bcc4
Fixes: 28326451
 2016-04-27 16:33:39 -04:00
Daniel Nishi
883c2141eb Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev 2016-04-27 20:31:58 +00:00
Daniel Nishi
c73fb891bc Fix a Deletion Helper crash when it fails to get an app list. 
Bug 28424827
Change-Id: I5c3c426d557fb1647a3909bf88fbb7d24329dc57
 2016-04-27 20:29:07 +00:00
Bill Yi
07b3d8856f Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20 -s ours am: eeee531 -s ours 
am: 82c9b8a  -s ours

* commit '82c9b8a36181aead5be12aeb19722860db59444f':
  Import translations. DO NOT MERGE

Change-Id: I4e032cc75007c06fad374f54ec084d3b05406af6
 2016-04-27 20:17:34 +00:00
Bill Yi
965c41c142 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 88e71ef -s ours 
am: 7927bec  -s ours

* commit '7927becdbeb18101f63d7180dc96faa4f465b057':
  Import translations. DO NOT MERGE

Change-Id: Idc20e2af5daaa3268a165aa9572d4b1568684ea1
 2016-04-27 20:17:33 +00:00
Bill Yi
82c9b8a361 Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20 -s ours 
am: eeee531  -s ours

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

Change-Id: I671ac6baff8902125fa57d3f8344be132a015eb0
 2016-04-27 20:02:51 +00:00
Bill Yi
7927becdbe Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 88e71ef  -s ours

* commit '88e71ef15142712d6c5c4d6871afee1f88ce428e':
  Import translations. DO NOT MERGE

Change-Id: I93ae38563d3303a2eab5957f8dbfd0740f580a92
 2016-04-27 20:02:50 +00:00
Bill Yi
eeee5312a2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: eb50d20  -s ours

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

Change-Id: Ia29296e9801f45c2cfb70ac151d257078bc90253
 2016-04-27 19:56:17 +00:00
Bill Yi
1e21b15db1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: eb50d20  -s ours

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

Change-Id: Ic9e597c9fe422865b44113e31f0e49567f0f37e4
 2016-04-27 19:56:10 +00:00
Bill Yi
88e71ef151 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-04-27 19:44:32 +00:00
Bill Yi
eb50d20504 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 19:44:13 +00:00
TreeHugger Robot
b806599ece Merge "Import translations. DO NOT MERGE" 2016-04-27 19:43:09 +00:00
Jason Monk
96486d4066 Merge "Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 3cb641e" into nyc-mr1-dev-plus-aosp 
am: 33ad219

* commit '33ad219176d276ffb27bbdec2a393c7eb999180d':

Change-Id: Iea18ffb2be3ee0450f84604f08f99e83ba7c472a
 2016-04-27 19:36:12 +00:00
Clara Bayarri
a0ad1b5cf2 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 03fb024 
am: c8ab34c

* commit 'c8ab34c5e44608ecab00da342916933b50d47eb7':
  Fix Settings Condition expand button a11y label

Change-Id: Idf60d662db506c3c7089a413fff7ea29b7c0685c
 2016-04-27 19:36:11 +00:00
Felipe Leme
616ff3e6a4 Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS. 
BUG: 26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
 2016-04-27 12:33:57 -07:00
Android Build Merger (Role)
33ad219176 Merge "Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 3cb641e" into nyc-mr1-dev-plus-aosp 2016-04-27 19:31:38 +00:00
Jason Monk
c8ab34c5e4 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 
am: 03fb024

* commit '03fb0244d58d1d932570c1eacdce498d8146e68f':
  Fix Settings Condition expand button a11y label

Change-Id: Ia0d8bb962071b75f5d78912a07e64d012caff9ce
 2016-04-27 19:31:26 +00:00