PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,244 Commits 1 Branch 0 Tags
a1aba5484be655c7e7bfeab0a51a91aeb46d6457
Commit Graph

18244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
a1aba5484b am 13259fd3: am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev automerge: 0ae8d5c 
* commit '13259fd3a1666018328a45095cca5918a7c297d0':
  Final UX for Wi-Fi assistant platform settings.
 2014-11-15 03:09:14 +00:00
Jeff Davidson
13259fd3a1 am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 
automerge: 0ae8d5c

* commit '0ae8d5caa854199cbf727e89940b8a408b34dc8c':
  Final UX for Wi-Fi assistant platform settings.
 2014-11-15 01:24:18 +00:00
Jeff Davidson
0ae8d5caa8 am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 
* commit 'c01754bac9dffb58221f418d0b8418862b43b117':
  Final UX for Wi-Fi assistant platform settings.
 2014-11-15 00:21:59 +00:00
Jeff Davidson
c01754bac9 Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 2014-11-15 00:17:03 +00:00
Jeff Davidson
ce32b21727 Final UX for Wi-Fi assistant platform settings. 
When one app is available, the toggle works as before. When multiple
apps are available, we allow the user to choose the app in a dialog
before turning on the setting.

Bug: 13780935
Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
 2014-11-14 15:27:21 -08:00
John Spurlock
28b826a7da am 94ad9981: am fdebfc35: Settings: Add effects suppression text to Ring volume. automerge: d099aa6 
* commit '94ad99814abfd1822b1597ddb4068fbc838e0123':
  Settings: Add effects suppression text to Ring volume.
 2014-11-14 23:00:57 +00:00
John Spurlock
94ad99814a am fdebfc35: Settings: Add effects suppression text to Ring volume. 
automerge: d099aa6

* commit 'd099aa62ef1437dd5bb71e7b8e68885f7a1d7cc0':
  Settings: Add effects suppression text to Ring volume.
 2014-11-14 22:56:18 +00:00
Jeff Sharkey
06fc055bfa am 989f8a11: am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev automerge: f685335 
* commit '989f8a11b2852ff818a6839642db1661606fb549':
  Migrate license display to HTMLViewer.
 2014-11-14 21:55:40 +00:00
Jeff Sharkey
989f8a11b2 am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 
automerge: f685335

* commit 'f6853357ac029ad82e99442066d5b6adc1286a06':
  Migrate license display to HTMLViewer.
 2014-11-14 21:47:04 +00:00
John Spurlock
d099aa62ef am fdebfc35: Settings: Add effects suppression text to Ring volume. 
* commit 'fdebfc35c43c445afcd39077f5cbcf72902b1d6e':
  Settings: Add effects suppression text to Ring volume.
 2014-11-14 21:44:47 +00:00
John Spurlock
fdebfc35c4 Settings: Add effects suppression text to Ring volume. 
If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.

Update volume pref design to optimize for this new custom appearance.

Depends on frameworks/base:
  Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5

Bug: 17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
 2014-11-14 14:38:03 -05:00
Jeff Sharkey
f6853357ac am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 
* commit 'c88cdea2bb6f830abb8f1fe3b422368d3275f88c':
  Migrate license display to HTMLViewer.
 2014-11-14 19:29:31 +00:00
Jeff Sharkey
c88cdea2bb Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 2014-11-14 19:24:43 +00:00
Robin Lee
a126948e0c am 53ad5ec7: am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 
* commit '53ad5ec71b26197e64ac247b1f811a5583eaf98e':
  Forward wifi cert install intents to primary user
 2014-11-14 19:19:45 +00:00
Jeff Sharkey
e16e44f756 Migrate license display to HTMLViewer. 
For security purposes, we're no longer allowing WebView to be loaded
when running as system UID.  Instead, we now launch HTMLViewer to
show the details.

Bug: 18376908
Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
 2014-11-14 09:46:33 -08:00
Robin Lee
53ad5ec71b am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 
* commit '983253d18acef74ea1f35e20085e8fb1b5fe2265':
  Forward wifi cert install intents to primary user
 2014-11-14 11:32:04 +00:00
Robin Lee
983253d18a am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 
* commit 'e464d9b9ee133d366bec1b6c879889572c9996d8':
  Forward wifi cert install intents to primary user
 2014-11-14 11:28:43 +00:00
Robin Lee
e464d9b9ee Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 2014-11-14 11:26:39 +00:00
PauloftheWest
3dc6c4e6f3 am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a':
  Adding Sim Status menu to Settings.
 2014-11-14 00:43:19 +00:00
PauloftheWest
f95f2590c1 am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit '0f4254fab38fc7b47e4532446dd13338aa4c2cf0':
  Adding Sim Status menu to Settings.
 2014-11-13 15:15:46 +00:00
PauloftheWest
0f4254fab3 am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit '26104298eb53d2dfa693eec32934f9ac0aa3d525':
  Adding Sim Status menu to Settings.
 2014-11-13 15:08:03 +00:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +00:00
Robin Lee
8823c3eda2 Forward wifi cert install intents to primary user 
Wifi certificates need to be installed on behalf of UID 1010 which
belongs to user 0, even if the installer is another user. This
requires a cross-profile switch before performing the install.

Bug: 17605542
Change-Id: Ib3dfb4c280f1686d29005c7a044bf80dc00e963a
 2014-11-13 11:19:15 +00:00
Geoff Mendal
a34d65ae20 am 22ab79dd: (-s ours) am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '22ab79dd47e882fc3e7417fa148da89234b0ad35':
  Import translations. DO NOT MERGE
 2014-11-13 02:15:55 +00:00
Sanket Padawe
6d795b9161 am 2856fb31: am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit '2856fb31e8b573b54f8064941795efcd8a9324bd':
  UI changes for icons in sim settings
 2014-11-13 02:13:26 +00:00
Geoff Mendal
c442da4f7e am b05537c0: (-s ours) am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit 'b05537c0ae85b43c7497f8b1dd1bda9f910707d9':
  Import translations. DO NOT MERGE
 2014-11-13 02:13:25 +00:00
Geoff Mendal
22ab79dd47 am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '28408035173a5e15f6ccc119bc61127cfd989f0c':
  Import translations. DO NOT MERGE
 2014-11-13 00:00:37 +00:00
Sanket Padawe
2856fb31e8 am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit 'f722ff93fc2c2e6799970a29e59d5db0a152b1e4':
  UI changes for icons in sim settings
 2014-11-12 23:50:34 +00:00
Geoff Mendal
b05537c0ae am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit '1503406487bb2f0412fce00c83533093006b04d7':
  Import translations. DO NOT MERGE
 2014-11-12 23:50:33 +00:00
Geoff Mendal
2840803517 am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c5079a06dc2f57718cd781ae855b687a14cc1c2f':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:23 +00:00
Geoff Mendal
c5079a06dc am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '827ad0c38c76b932237fc22ecfcb35bff8de148f':
  Import translations. DO NOT MERGE
 2014-11-12 23:34:27 +00:00
Geoff Mendal
827ad0c38c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:30:10 +00:00
PauloftheWest
76b0801173 Adding Sim Status menu to Settings. 
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417)

Bug: 18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
 2014-11-12 14:52:18 -08:00
Geoff Mendal
c9e7209ca8 Import translations. DO NOT MERGE 
Change-Id: I99007a120d90a442a65f31ab35b8da3d1aa8524e
Auto-generated-cl: translation import
 2014-11-12 14:48:49 -08:00
Sanket Padawe
f722ff93fc am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit '6416bec01de67492ac761ba84c8b86c59e4dee28':
  UI changes for icons in sim settings
 2014-11-12 22:46:03 +00:00
Geoff Mendal
1503406487 am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit 'fbce961b80d731e6eb473de4c1ae5e683bed5566':
  Import translations. DO NOT MERGE
 2014-11-12 22:45:59 +00:00
Sanket Padawe
6416bec01d Merge "UI changes for icons in sim settings" into lmp-mr1-dev 2014-11-12 22:08:53 +00:00
Geoff Mendal
fbce961b80 am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit '9ae3bf2d3fca27966328e68263880080a1bdd79e':
  Import translations. DO NOT MERGE
 2014-11-12 22:04:57 +00:00
Sanket Padawe
0381f6c675 UI changes for icons in sim settings 
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog

Bug: 18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
 2014-11-12 12:41:35 -08:00
Geoff Mendal
9ae3bf2d3f Import translations. DO NOT MERGE 
Change-Id: I8170fefa7733e2feddad643069cc0407631a2b96
Auto-generated-cl: translation import
 2014-11-12 12:07:20 -08:00
Geoff Mendal
6020c72618 am 6065a571: (-s ours) am 7897993b: (-s ours) am cdbba048: (-s ours) Import translations. DO NOT MERGE 
* commit '6065a571acd38872225fda398345eae594ea2fbe':
  Import translations. DO NOT MERGE
 2014-11-12 18:32:27 +00:00
Geoff Mendal
c28e2544c3 am 37b06e06: (-s ours) am a1486acf: (-s ours) Import translations. DO NOT MERGE 
* commit '37b06e06dd3257b7e6b1c892dace4b4cdce0d9e2':
  Import translations. DO NOT MERGE
 2014-11-12 18:32:26 +00:00
Geoff Mendal
6065a571ac am 7897993b: (-s ours) am cdbba048: (-s ours) Import translations. DO NOT MERGE 
* commit '7897993b6175d605dcf6d3318388005ea693ad4a':
  Import translations. DO NOT MERGE
 2014-11-12 18:25:16 +00:00
Geoff Mendal
37b06e06dd am a1486acf: (-s ours) Import translations. DO NOT MERGE 
* commit 'a1486acfeff910751b255b597383e5465670cdf0':
  Import translations. DO NOT MERGE
 2014-11-12 18:25:15 +00:00
Geoff Mendal
7897993b61 am cdbba048: (-s ours) Import translations. DO NOT MERGE 
* commit 'cdbba0489bec3a889c457312183ab9ab855cfc51':
  Import translations. DO NOT MERGE
 2014-11-12 18:23:10 +00:00
Geoff Mendal
5bd9c01b43 Import translations. DO NOT MERGE 
Change-Id: I71de5d728294ddcf9a6ae0ddb6d5682d1b03e955
Auto-generated-cl: translation import
 2014-11-12 10:05:24 -08:00
Geoff Mendal
a1486acfef Import translations. DO NOT MERGE 
Change-Id: Id80c19a2c80275ea0c63e12d23761e5bed47f0b8
Auto-generated-cl: translation import
 2014-11-12 09:53:14 -08:00
Geoff Mendal
cdbba0489b Import translations. DO NOT MERGE 
Change-Id: I628e96983ed2224fb17081a509a7de379b89b88b
Auto-generated-cl: translation import
 2014-11-12 09:48:33 -08:00
vandwalle
45e7a93e95 am bf1dcec1: Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 53ad50b automerge: 4f2c003 
* commit 'bf1dcec15f95ce785b78a0657fd601879f1b1135':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 03:45:33 +00:00
Wink Saville
4bd0064b3b am 324cabb2: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 588611e automerge: 754da43 
* commit '324cabb2d87e9209f0031bad2ce99929ba627dc5':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:45:32 +00:00