PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,261 Commits 1 Branch 0 Tags
b0d54ca66083e945d0b51a3801e36873dd24c466
Commit Graph

30261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
e8fce6d433 Merge "Restrict Settings always-on to NYC+" into nyc-dev 
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
 2016-06-06 21:09:30 +00:00
Robin Lee
cff703e68a Merge "Restrict Settings always-on to NYC+" into nyc-dev 
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Icdd13f90ce7c38b8d3fdc4f5b5247f97f6a21127
 2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c Merge "Restrict Settings always-on to NYC+" into nyc-dev 2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c Fix data usage format strings 
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
 2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1 Restrict Settings always-on to NYC+ 
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
 2016-06-06 17:04:36 +00:00
Bill Yi
d404ee401a Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours am: e2b9a2bd87 -s ours 
am: ce51385f29  -s ours

* commit 'ce51385f29bd1bf2316de0bac2feeb9cc798c91e':

Change-Id: I70c600bafdda7d1fc0e7d17283026c80a8edd406
 2016-06-04 00:24:24 +00:00
Jason Monk
493cbe1b21 Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf am: 2cd2074f7f 
am: 7adbeba736

* commit '7adbeba736318d698ce1acfa3f740828a63f834b':

Change-Id: I5748b54fecc9c8ee3e5e640d5510c0bb89dbd341
 2016-06-04 00:24:24 +00:00
Andrew Sapperstein
905ab6b743 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev am: 6c52398695 
am: 66fb65b867

* commit '66fb65b867dcbb00276b5104228e9b5a82da8c90':
  Add safety & regulatory info to "about device".

Change-Id: I2ef8b0e7efc702d8652c5f6bf6e8be7e4d9e21df
 2016-06-04 00:24:23 +00:00
Bill Yi
7b04f56164 Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours am: 1f055cb81d -s ours 
am: c90e7685ca  -s ours

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

Change-Id: Ia2f0c20ed0eb85f2de4b61b6a38e436bae94bbbb
 2016-06-04 00:24:23 +00:00
Jason Monk
152a7072af Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf am: 8a1d371239 
am: f7d775c3d6

* commit 'f7d775c3d6a699eab12efed7a54f68165d805a64':
  Fix accidental non-translatable string

Change-Id: I2e003723d8b778fda71a36e4077e491777149467
 2016-06-04 00:24:22 +00:00
Bill Yi
ce51385f29 Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours 
am: e2b9a2bd87  -s ours

* commit 'e2b9a2bd87310556cc3d0aee40fbc60d22c49954':

Change-Id: I0ca7aa83ed5af62a846a5f494b66bab0e4869896
 2016-06-03 23:33:31 +00:00
Jason Monk
7adbeba736 Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf 
am: 2cd2074f7f

* commit '2cd2074f7f20eeb3de52743dc2733eae25762ffe':

Change-Id: Ie2e2b4997c643421c5f53f3c46f91fe26ebf41dc
 2016-06-03 23:33:31 +00:00
Andrew Sapperstein
66fb65b867 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev 
am: 6c52398695

* commit '6c52398695164aeba6c3ad8ebc8047ffe98805df':
  Add safety & regulatory info to "about device".

Change-Id: I7feb228f842a1697c2e3c56bfb6c1dcb0694c9b5
 2016-06-03 23:29:53 +00:00
Bill Yi
c90e7685ca Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours 
am: 1f055cb81d  -s ours

* commit '1f055cb81d40e4c2460c4421a44e1c9251a1313c':
  Import translations. DO NOT MERGE

Change-Id: I7010a07cedd23ac9ae5f2bcebab8b6b20e60803e
 2016-06-03 23:29:52 +00:00
Jason Monk
f7d775c3d6 Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf 
am: 8a1d371239

* commit '8a1d371239ec88bb85c38c2f484625d401a5ed8e':
  Fix accidental non-translatable string

Change-Id: Ic637ea0a09b49d250b80690094a5cd21ba31d236
 2016-06-03 23:29:51 +00:00
Andrew Sapperstein
6c52398695 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev 2016-06-03 22:22:38 +00:00
Bill Yi
1f055cb81d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: edafefc1ed  -s ours

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

Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4
 2016-06-03 22:21:49 +00:00
Jason Monk
8a1d371239 Merge "Fix accidental non-translatable string" into nyc-dev 
am: 8c5dccc6bf

* commit '8c5dccc6bf05397cf4c51ce88d561fecbebba059':
  Fix accidental non-translatable string

Change-Id: I71c42ccd2daca0801263809edb36eb4d175d444a
 2016-06-03 22:21:47 +00:00
Bill Yi
e2b9a2bd87 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: edafefc1ed  -s ours

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

Change-Id: I534c3d6e54efda539b6f246161f70328b5ff7916
 2016-06-03 21:08:44 +00:00
Jason Monk
2cd2074f7f Merge "Fix accidental non-translatable string" into nyc-dev 
am: 8c5dccc6bf

* commit '8c5dccc6bf05397cf4c51ce88d561fecbebba059':
  Fix accidental non-translatable string

Change-Id: I27dbea3833ed4e8c491a26da676da4b4e02696ca
 2016-06-03 21:06:10 +00:00
Bill Yi
7340ea57fd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6c3dac1f89 -s ours 
am: f36b989635  -s ours

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

Change-Id: Ib9a30be17b0c9b24803b16e57648a75e40db4c11
 2016-06-03 19:41:51 +00:00
Bill Yi
f36b989635 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 6c3dac1f89  -s ours

* commit '6c3dac1f89ee770a02b369be6dcc94135ce4e24a':
  Import translations. DO NOT MERGE

Change-Id: I1f8ddda3dc29c7f14a77e25960b749c8d4a772c4
 2016-06-03 19:33:29 +00:00
TreeHugger Robot
edafefc1ed Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 19:22:57 +00:00
TreeHugger Robot
6c3dac1f89 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 19:18:31 +00:00
Jason Monk
8c5dccc6bf Merge "Fix accidental non-translatable string" into nyc-dev 2016-06-03 19:12:09 +00:00
Jason Monk
18b603f84f Fix accidental non-translatable string 
Bug: 29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
 2016-06-03 15:06:56 -04:00
Sanket Agarwal
9936e92160 Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92 am: e1fa67c165 am: 083ba3cc2a 
am: 7b54a93fe3

* commit '7b54a93fe34aad7c73cafcee56066d2b5b52e30d':
  Handle return value when Bluetooth is enabled

Change-Id: I5c51b32431452a2ef79ba29e7f285fd880182364
 2016-06-03 18:54:30 +00:00
Sanket Agarwal
7b54a93fe3 Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92 am: e1fa67c165 
am: 083ba3cc2a

* commit '083ba3cc2ac3494ab8e03cd2303f454e3a57d6ab':
  Handle return value when Bluetooth is enabled

Change-Id: I340b8c78b23061e7c74ba47b1ab016332c0ee903
 2016-06-03 18:34:18 +00:00
Sanket Agarwal
083ba3cc2a Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92 
am: e1fa67c165

* commit 'e1fa67c165ab7f1475ca4fc89be4e98dafa68a1d':
  Handle return value when Bluetooth is enabled

Change-Id: I2446e2ab09eb061be09fafc73ed71e10dadd47ab
 2016-06-03 18:01:45 +00:00
Sudheer Shanka
ae383c7b01 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 am: 377623b6ee 
am: c3201f73ef

* commit 'c3201f73ef7490a7446e54217d4923b6e5cf4f63':

Change-Id: I3a80cb049f704c9b28dfd0de3843971039eb25b5
 2016-06-03 17:53:52 +00:00
Sanket Agarwal
e1fa67c165 Merge "Handle return value when Bluetooth is enabled" 
am: cc889f6b92

* commit 'cc889f6b9293cf9d9b693d721369f71aefeb1b6a':
  Handle return value when Bluetooth is enabled

Change-Id: I5bda2e1e740846a3da07cec95987b7ec800221fd
 2016-06-03 17:51:28 +00:00
Sudheer Shanka
c3201f73ef Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 
am: 377623b6ee

* commit '377623b6eea4fab4492a8593a7bc66d5598f0260':

Change-Id: If3a40be94c7e73aad9197b6ab47ea38c683fd5b2
 2016-06-03 17:44:40 +00:00
Bill Yi
ed57d2f783 Import translations. DO NOT MERGE 
Change-Id: Ief4e4adccef8f8a438e629d07e3129f3441293b6
Auto-generated-cl: translation import
 2016-06-03 10:43:44 -07:00
Treehugger Robot
cc889f6b92 Merge "Handle return value when Bluetooth is enabled" 2016-06-03 17:42:38 +00:00
Sudheer Shanka
ea128a798f Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 am: 7469d799a8 
am: f23a161d65

* commit 'f23a161d65ea77b24e53818a39faf8c86c063292':
  Avoid triggering device admin settings in non-current user.

Change-Id: I9e2084f66e7acc509e25e24128e0802059c55f82
 2016-06-03 17:36:16 +00:00
Sudheer Shanka
f23a161d65 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 
am: 7469d799a8

* commit '7469d799a8acaa1fd72aa0545d090d57d5e9d29a':
  Avoid triggering device admin settings in non-current user.

Change-Id: I3106a0c680bc5f267cefe9621b37ccc3186561ec
 2016-06-03 17:24:06 +00:00
Sudheer Shanka
377623b6ee Merge "Avoid triggering device admin settings in non-current user." into nyc-dev 
am: a433fd2429

* commit 'a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
  Avoid triggering device admin settings in non-current user.

Change-Id: I0557ea43f891a272f946987197bbb7df0aef9b0e
 2016-06-03 17:14:43 +00:00
Sudheer Shanka
7469d799a8 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev 
am: a433fd2429

* commit 'a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
  Avoid triggering device admin settings in non-current user.

Change-Id: Ica84a34db826fa02130aa85efff40544b246c3ef
 2016-06-03 17:13:09 +00:00
Bill Yi
73642fd30c Import translations. DO NOT MERGE 
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
 2016-06-03 10:09:43 -07:00
TreeHugger Robot
a433fd2429 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev 2016-06-03 17:02:51 +00:00
Makoto Onuki
f50d7ae1ec Fix RTL layout am: 3a87050921 am: 622992625f 
am: a329a5e84d

* commit 'a329a5e84d37d2526c8566d1d0823b107d108c29':

Change-Id: I28f0cfa15cb4a7e2445a23ebd0bf3f6635979b23
 2016-06-03 15:51:20 +00:00
Makoto Onuki
4a63a83c55 Fix RTL layout am: 3a87050921 am: a8a8167ebb 
am: 26db302e41

* commit '26db302e4129c58e684a0a1c1408464e383eae43':
  Fix RTL layout

Change-Id: I92c733ca40c99c4203f176c2c7a5bacf65c74071
 2016-06-03 15:51:17 +00:00
Makoto Onuki
a329a5e84d Fix RTL layout am: 3a87050921 
am: 622992625f

* commit '622992625fb0e0168dd1473f69a9b081922e859f':

Change-Id: Ic0ec3335880aeec5fa6637e172ea592390e4bcaf
 2016-06-03 15:44:21 +00:00
Makoto Onuki
26db302e41 Fix RTL layout am: 3a87050921 
am: a8a8167ebb

* commit 'a8a8167ebb0f89962fbe31aa77e3af2aa50258ec':
  Fix RTL layout

Change-Id: Ifdcaf3aefbcb0e143960d6cdbb184a2f285de343
 2016-06-03 15:42:45 +00:00
Makoto Onuki
a8a8167ebb Fix RTL layout 
am: 3a87050921

* commit '3a87050921f78e0882893bc343e49b8bb1b34975':
  Fix RTL layout

Change-Id: Ic758b78742843261a92f9f87bc2f602223955e8e
 2016-06-03 15:33:57 +00:00
Makoto Onuki
622992625f Fix RTL layout 
am: 3a87050921

* commit '3a87050921f78e0882893bc343e49b8bb1b34975':
  Fix RTL layout

Change-Id: Ia43ea6cb762de491564ed442d3751c2887d85735
 2016-06-03 15:33:52 +00:00
Sanket Agarwal
3d06893ba6 Handle return value when Bluetooth is enabled 
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.

Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
 2016-06-03 01:07:24 +00:00
Makoto Onuki
3a87050921 Fix RTL layout 
Bug 29072224

Change-Id: I414d868b4256e034850a873511bf34d9430842dc
 2016-06-02 17:52:17 -07:00
Fyodor Kupolov
d8d4e5fba4 Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca am: a015e6ca16 
am: 0f008bf7e6

* commit '0f008bf7e675a168744bd41b0509a4969d17b341':

Change-Id: I5355d79df7f9965d68d87cbb023c50ff4e95b91f
 2016-06-02 23:05:29 +00:00
Fyodor Kupolov
d4f31e2b8d Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca am: 06a9c98bb8 
am: a67010c6f1

* commit 'a67010c6f17bf5cd3d897e8930467a37f56f6838':
  Make prefs without an action unselectable

Change-Id: I399dbb551f1c8d81e1e7af368e7119bd1d83f08e
 2016-06-02 23:00:22 +00:00