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

5946 Commits

Author SHA1 Message Date
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
63f7bc87d8 Created Multi-SIM notifications. 
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.

Bug: 18293625

Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
 2014-11-13 15:05:02 -08: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
Paul Crowley
51e0811a7a Force power cycle on cooldown. 
Bug: 18292029
Change-Id: I02b6eff56902859ae3aba4909656553f4b322b0c
 2014-11-13 14:52:19 +00:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +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
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
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
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
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
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
Zoltan Szatmary-Ban
7cc1b9e63e Show managed profile accounts on Settings > Factory Reset 
List both primary profile's and managed profile's accounts. Also notify the user
if there are other users present on the device.

Bug: 17899181
Change-Id: I5401722e65305861edeed60cfe926fca5c81a418
 2014-11-12 01:18:29 +00:00
John Spurlock
5f0d6e2b77 am 32830286: am 0193911e: Settings: Tweak doze settings description. automerge: 9259316 
* commit '32830286e83f26af871785741a65d18c0c5f5058':
  Settings: Tweak doze settings description.
 2014-11-11 18:55:37 +00:00
John Spurlock
32830286e8 am 0193911e: Settings: Tweak doze settings description. 
automerge: 9259316

* commit '925931601d48a0cdec885f1a381339f78c282bcf':
  Settings: Tweak doze settings description.
 2014-11-11 18:51:45 +00:00
John Spurlock
925931601d am 0193911e: Settings: Tweak doze settings description. 
* commit '0193911ea5a81e772a3d07e62af768559c36f1d5':
  Settings: Tweak doze settings description.
 2014-11-11 18:18:20 +00:00
John Spurlock
0193911ea5 Settings: Tweak doze settings description. 
Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759
 2014-11-11 13:07:09 -05:00
John Spurlock
db73eae8d9 am 1f382c6a: Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b automerge: 28c275e 
* commit '1f382c6a4fece4de542996adb27054088784503c':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:50:24 +00:00
John Spurlock
1f382c6a4f Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b 
automerge: 28c275e

* commit '28c275ed7035deb99154eb7c1ded6f289f515a24':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:43:47 +00:00
John Spurlock
28c275ed70 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 
automerge: 64cb79b

* commit '64cb79bb6982ebe2907daed761d829dea4fef081':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:33:20 +00:00
John Spurlock
64cb79bb69 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 2014-11-11 02:22:19 +00:00
Geoff Mendal
0bda36df16 Import translations. DO NOT MERGE 
Change-Id: I937efd74232d29cf16ddf148661da8e0f2f6896e
Auto-generated-cl: translation import
 2014-11-10 14:33:04 -08:00
Geoff Mendal
fa0ed7a83f Import translations. DO NOT MERGE 
Change-Id: I239d9e96f7a88bb558ec2f14955ae98af32fab23
Auto-generated-cl: translation import
 2014-11-10 14:17:52 -08:00
Geoff Mendal
c0c56cad2b Import translations. DO NOT MERGE 
Change-Id: I89de05dbac32f4acf541a4a2d6cb3225652fd39b
Auto-generated-cl: translation import
 2014-11-10 14:12:28 -08:00
John Spurlock
49300d19ab Settings: Update preference summary per new downtime behavior. 
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
 2014-11-10 14:49:10 -05:00
Fabrice Di Meglio
1515051537 am 8a343c44: am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit '8a343c44215db5d8099ab0ace8b5a4a123ce62e8':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:22:00 +00:00
Fabrice Di Meglio
8a343c4421 am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit '3c05c164bfb640990102734e73884252b803abe8':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:18:02 +00:00
Fabrice Di Meglio
3c05c164bf am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit 'd9966523f0c5dc3c3a68c5e0ecfb1a0b1f2bca70':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:12:30 +00:00
Fabrice Di Meglio
d9966523f0 Merge "Fix bug #18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev 2014-11-07 23:07:05 +00:00
Fabrice Di Meglio
e7ed65602b Fix bug #18289076 Storage graph colors don't match Material design spec 
- update colors per UX request for matching Material Design colors spec

Change-Id: Ibee52ee0edef2d678d86e3960cd7ff058476a25e
 2014-11-07 14:46:20 -08:00
Jason Monk
cbf1d5d0dc am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
automerge: 0ae5f60

* commit '0ae5f6037b68794dc8a394c24a6ec8413c97555f':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:18:40 +00:00
Jason Monk
0ae5f6037b am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'dac36fafbe5757bdfc44d50e93c4e2771fbc71e0':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:07:02 +00:00
Jason Monk
dac36fafbe am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'cc0a2c554a8a576df2dbf4f564970cd67cd34e77':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:02:03 +00:00
Jason Monk
cc0a2c554a Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 2014-11-07 16:58:37 +00:00
Jason Monk
d570e9839e Screen pinning: fix strings and add scrollview 
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.

Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
 2014-11-07 11:46:33 -05:00
Baligh Uddin
449dc733e3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:03:15 +00:00
Baligh Uddin
5fbfdc83e4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:03:01 +00:00
Baligh Uddin
d287e3f821 Merge "Import translations. DO NOT MERGE" 2014-11-07 15:02:35 +00:00
Alexandra Gherghina
eb320d2bad am 6f8019d8: am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev 
* commit '6f8019d8891095cce375ce7f7ebbf3ad8ba6d57c':
  Update text for apps installed for other users
 2014-11-07 10:48:43 +00:00
Alexandra Gherghina
6f8019d889 am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev 
* commit 'fcb880c6d1cbe23bcfcbd92f1b6cdc3c88892e39':
  Update text for apps installed for other users
 2014-11-07 10:44:51 +00:00
Alexandra Gherghina
fcb880c6d1 am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev 
* commit 'ee70c69919d3e49ba76d2710850fd70be5c09998':
  Update text for apps installed for other users
 2014-11-07 10:39:42 +00:00
Alexandra Gherghina
ee70c69919 Merge "Update text for apps installed for other users" into lmp-mr1-dev 2014-11-07 10:35:38 +00:00
Alexandra Gherghina
d9ed84375d Update text for apps installed for other users 
This also refactors the layout to accommodate longer text

Bug: 16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
 2014-11-07 10:05:49 +00:00
Fabrice Di Meglio
d103e453c6 am 981ab4b2: am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit '981ab4b2f194c52f4401b3c6e55fb9549204e051':
  Update synonyms and fix some issues related to them
 2014-11-07 04:17:46 +00:00
Paul Crowley
a03cd588d2 am 0844554f: am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev 
* commit '0844554f82b0db64cb2eeb8f0aac681edb7ad6f6':
  Add a new flow for decryption checking.
 2014-11-07 04:15:35 +00:00
Jeff Davidson
568d156089 am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card. 
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.
 2014-11-07 04:12:59 +00:00
Fabrice Di Meglio
981ab4b2f1 am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit 'a581a16dcd7bd02260ce4e3c1e8635478a817bc1':
  Update synonyms and fix some issues related to them
 2014-11-07 01:55:39 +00:00
Fabrice Di Meglio
a581a16dcd am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit 'fff7e020e83b1f23de11a842c56728f8a739a8d1':
  Update synonyms and fix some issues related to them
 2014-11-07 01:46:20 +00:00