PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,019 Commits 1 Branch 0 Tags
a9f6b69398b3338a9fd1bed856fc37632482b59c
Commit Graph

28019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
6233c1d0bc Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev 
am: f8c64089b1

Change-Id: Idf719bc91baba5fe18c044183794da4a74251bdd
 2016-06-08 00:38:35 +00:00
Jim Miller
5b9fab40a0 Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev 
am: f8c64089b1

Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8
 2016-06-08 00:38:29 +00:00
TreeHugger Robot
f8c64089b1 Merge "Move legacy full disk encryption code to Settings." into nyc-dev 2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38 Move legacy full disk encryption code to Settings. 
Fixes bug 27617297

Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
 2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02 Fix disabling of tiles that are not relevant 
- Fix restricted user tiles being disabled
 - Call new better method in SettingsDrawerActivity for disabling

Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
 2016-06-07 14:02:33 -04:00
Bill Yi
bf986bb7d0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: ca24281df8  -s ours

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

Change-Id: Ic21cfb870060f52e88d7c224599adfc22561fcfe
 2016-06-07 03:39:09 +00:00
Bill Yi
1ee6221214 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours 
am: f12e2ee361  -s ours

* commit 'f12e2ee361e4973a858d6b0e31c9b3c7a54045ed':

Change-Id: I3c809004b464b7532610850aeae2299271672e4a
 2016-06-07 03:37:14 +00:00
TreeHugger Robot
ca24281df8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 03:35:54 +00:00
Bill Yi
c6da591a08 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours 
am: e145cca1d0  -s ours

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

Change-Id: Ia396c589077bc718ed2ccd366a10efde0bc93ca8
 2016-06-07 03:33:59 +00:00
Bill Yi
f12e2ee361 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 48229d7781  -s ours

* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
  Import translations. DO NOT MERGE

Change-Id: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a
 2016-06-07 03:31:23 +00:00
Bill Yi
e145cca1d0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 48229d7781  -s ours

* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
  Import translations. DO NOT MERGE

Change-Id: Ia9398ea959de34c41ecdf48f47bdf433dd25bf65
 2016-06-07 03:31:21 +00:00
TreeHugger Robot
48229d7781 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 03:23:12 +00:00
Bill Yi
937c29d240 Import translations. DO NOT MERGE 
Change-Id: Ife628ac799a79648619b9d52df5ec0da1287281d
Auto-generated-cl: translation import
 2016-06-06 19:03:01 -07:00
Bill Yi
d4bd56b2a7 Import translations. DO NOT MERGE 
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
 2016-06-06 18:48:05 -07:00
Meng Wang
0dc4311333 Wi-Fi Calling settings UI update 
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
 2016-06-06 16:49:02 -07:00
Robin Lee
a47ec95e73 Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c 
am: e8fce6d433

* commit 'e8fce6d4332e3ee4000d9efb548f5de3bbadb4a8':

Change-Id: I4ce9abb873d9480d1d83f29d39b03f0d8447a710
 2016-06-06 21:22:07 +00:00
Robin Lee
dbf70ca4ab Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c 
am: cff703e68a

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

Change-Id: Ic60a75f6694dcb51c7d3ed398bf644b7ed1108b6
 2016-06-06 21:12:27 +00:00
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
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