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

27846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
0f008bf7e6 Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca 
am: a015e6ca16

* commit 'a015e6ca1687b7a3eb9778ba1c05c78fe7b90e84':

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

* commit '06a9c98bb8af4eb3a7fbd65239deabc79853c54d':
  Make prefs without an action unselectable

Change-Id: I7781c25e91056ddb8d94b1ad5f4fc709d0fbfbb0
 2016-06-02 22:49:41 +00:00
Fyodor Kupolov
a015e6ca16 Merge "Make prefs without an action unselectable" into nyc-dev 
am: 9121169dca

* commit '9121169dca4bf3f11908031fd72448025d3933d4':
  Make prefs without an action unselectable

Change-Id: Ia3b0efe9acd7c4ebf9213d141211f23322b8152e
 2016-06-02 22:49:07 +00:00
Fyodor Kupolov
06a9c98bb8 Merge "Make prefs without an action unselectable" into nyc-dev 
am: 9121169dca

* commit '9121169dca4bf3f11908031fd72448025d3933d4':
  Make prefs without an action unselectable

Change-Id: I214ef870006bf5257ac3b51354ce20c429db3ea5
 2016-06-02 22:44:44 +00:00
Fyodor Kupolov
9121169dca Merge "Make prefs without an action unselectable" into nyc-dev 2016-06-02 22:30:22 +00:00
Andrew Sapperstein
1fad9af3c7 Add safety & regulatory info to "about device". 
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".

The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.

BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
 2016-06-02 14:12:19 -07:00
Sudheer Shanka
8b72e563ec Avoid triggering device admin settings in non-current user. 
Bug: 28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
 2016-06-02 12:40:22 -07:00
Fyodor Kupolov
77865ec827 Make prefs without an action unselectable 
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.

Bug: 29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
 2016-06-02 10:39:33 -07:00
Android Build Merger (Role)
7da19a1610 Merge "Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c am: c687e9bfbd" into nyc-mr1-dev-plus-aosp 2016-06-02 17:26:41 +00:00
Wei Wang
ba05928629 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c 
am: c687e9bfbd

* commit 'c687e9bfbd698964bfbd75d5741a8ffb3b7e9a13':
  Revert "Add an entry in developer options for location tools."

Change-Id: I2dfa59969134f1253c5465aebf4d12db4cad69b5
 2016-06-02 17:26:12 +00:00
Wei Wang
1aa166f490 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c 
am: 704476a96d

* commit '704476a96d5363679ddcb6d311bb6ca7c4a5faae':
  Revert "Add an entry in developer options for location tools."

Change-Id: I3ed38b246d4f9aa64daa1c432d8f0b5020515e5a
 2016-06-02 17:25:41 +00:00
Wei Wang
c687e9bfbd Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev 
am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
 2016-06-02 17:22:59 +00:00
Wei Wang
704476a96d Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev 
am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I894e3bf6602adfb539b795e00f23d369dcb66251
 2016-06-02 17:22:59 +00:00
Wei Wang
d0d3ca3b7c Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev 2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba Revert "Add an entry in developer options for location tools." 
Bug:28251942

This reverts commit e1c1a13cba.

Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
 2016-06-02 04:42:02 +00:00
Jason Monk
b2af26dc9d resolve merge conflicts of 67e87fa to nyc-mr1-dev 
am: 718c84f121  -s ours

* commit '718c84f121c5c5237d346596f1d755e3d45f8d6a':

Change-Id: I487d39f0c62a9f028262cd36b255583411649e7b
 2016-06-01 21:17:27 +00:00
Jason Monk
a7f93dce8e Merge "onResume -> onStart, onPause -> onStop" into nyc-dev am: 67e87fa4e9 
am: 2cf7ecc1d4  -s ours

* commit '2cf7ecc1d436b4a37733af584867922700d3fcc2':
  onResume -> onStart, onPause -> onStop

Change-Id: I9ed1382d6ecc6e3206af357e66fff986fa1914f6
 2016-06-01 20:41:54 +00:00
Jason Monk
2cf7ecc1d4 Merge "onResume -> onStart, onPause -> onStop" into nyc-dev 
am: 67e87fa4e9

* commit '67e87fa4e903306d4e430acd871dbad0c189b06b':
  onResume -> onStart, onPause -> onStop

Change-Id: I1ca7fdc7246d40c82b3828b5d46762987a0d9a14
 2016-06-01 20:32:26 +00:00