PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,506 Commits 1 Branch 0 Tags
50bbce771324a264f720e402615fe6555b6c6e3b
Commit Graph

17506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
50bbce7713 am cbf347c4: am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 
* commit 'cbf347c42d06e27785ccde70763a2c4dbc45542d':
  Changed SIM lock toggle to a switch
 2014-12-02 21:34:58 +00:00
PauloftheWest
cbf347c42d am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 
* commit '794cbd70fa3d101b1a8a587faf327c7700c946eb':
  Changed SIM lock toggle to a switch
 2014-12-02 21:27:43 +00:00
PauloftheWest
794cbd70fa Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 2014-12-02 21:19:52 +00:00
PauloftheWest
b07cd34315 am 3fd2fa7b: am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 
* commit '3fd2fa7b96a72f63afd9e4495fde4d31fa42edd5':
  Bug Fix: SIM Status will display the proper network type
 2014-12-02 20:15:25 +00:00
PauloftheWest
3fd2fa7b96 am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 
* commit '003aee5f0adfde950407380a5c738ed4bc59bf2b':
  Bug Fix: SIM Status will display the proper network type
 2014-12-02 20:08:06 +00:00
PauloftheWest
003aee5f0a Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 2014-12-02 20:01:40 +00:00
PauloftheWest
6fc9207ebe Bug Fix: SIM Status will display the proper network type 
Bug: 18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
 2014-12-02 11:59:17 -08:00
Simranjit Singh Kohli
eeaf8608d3 am 04f2391d: am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 
* commit '04f2391d17ce994b6d1da5907c7b5010621091b2':
  [New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
 2014-12-02 19:31:26 +00:00
Simranjit Singh Kohli
04f2391d17 am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 
* commit '61066c13ed5ba493c58c76d84f489a35dc5af8d1':
  [New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
 2014-12-02 19:18:50 +00:00
Simranjit Singh Kohli
61066c13ed Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 2014-12-02 19:09:01 +00:00
PauloftheWest
96ba998a0b am 99348d69: am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev 
* commit '99348d6911ec15d9a93a2ce72b9c276929789499':
  Added color to Data Usage graph
 2014-12-02 18:12:22 +00:00
PauloftheWest
c33b2ee31a am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 
* commit 'f28bd654620102de2408383b9bba5114a9556267':
  Fixed a Wi-Fi dialog crash
 2014-12-02 18:12:21 +00:00
PauloftheWest
99348d6911 am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev 
* commit 'da02111f16b7d2b09fb447342a9aa4640c75a117':
  Added color to Data Usage graph
 2014-12-02 18:04:43 +00:00
PauloftheWest
f28bd65462 am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 
* commit 'fc6a8bf2d729ad21fa8d7622f580401db351c269':
  Fixed a Wi-Fi dialog crash
 2014-12-02 18:04:42 +00:00
PauloftheWest
506607d1f8 am 21316f1d: am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev 
* commit '21316f1d1aedaffbd9f882f4cecdf518e8521212':
  Remove extraneous SIM status information
 2014-12-02 18:04:15 +00:00
PauloftheWest
da02111f16 Merge "Added color to Data Usage graph" into lmp-mr1-dev 2014-12-02 17:58:47 +00:00
PauloftheWest
fc6a8bf2d7 Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 2014-12-02 17:58:24 +00:00
PauloftheWest
21316f1d1a am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev 
* commit '41c2962552b750a8e5fa07f283ba2b72b36d2298':
  Remove extraneous SIM status information
 2014-12-02 17:56:08 +00:00
PauloftheWest
41c2962552 Merge "Remove extraneous SIM status information" into lmp-mr1-dev 2014-12-02 17:50:31 +00:00
Maurice Lam
62009bf856 am a2caf633: am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 
* commit 'a2caf6332f2b55e1480724d025ffb7592dcd13f7':
  [WifiSetup] Swap buttons position in Skip dialog
 2014-12-02 03:12:18 +00:00
Maurice Lam
a2caf6332f am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 
* commit '1dce16a61c65ec9c1dd870edbd6dd3ef5d7ca703':
  [WifiSetup] Swap buttons position in Skip dialog
 2014-12-02 03:06:02 +00:00
Maurice Lam
1dce16a61c Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 2014-12-02 02:59:10 +00:00
Maurice Lam
72b29f9b7f am 86f184b3: am 6b19fa90: [FRP] Theming for Pattern and Password screens 
* commit '86f184b3d66af3db1302471c44441e1d2dc1867e':
  [FRP] Theming for Pattern and Password screens
 2014-12-02 01:13:08 +00:00
Maurice Lam
86f184b3d6 am 6b19fa90: [FRP] Theming for Pattern and Password screens 
* commit '6b19fa9017800b94c75238339a337fd8f6c3e808':
  [FRP] Theming for Pattern and Password screens
 2014-12-02 01:04:39 +00:00
Maurice Lam
6b19fa9017 [FRP] Theming for Pattern and Password screens 
Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.

This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.

Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a
 2014-12-01 16:18:27 -08:00
Maurice Lam
ab4fb49ab1 [WifiSetup] Swap buttons position in Skip dialog 
According to material-spec, buttons that keep users in the same
screen should be on the left (negative button) while button that
intorduce changes should be on the right, even if the action is
destructive.

Bug: 18542108
Change-Id: I335f83c6bb810cd43aeda28566baacea39435c57
 2014-12-01 12:09:10 -08:00
John Spurlock
9b63186b1f am 647bb8ff: am c868f703: Settings: Improve inline volume sliders. 
* commit '647bb8ff7586f2157d6efbd872494109f0eb6139':
  Settings: Improve inline volume sliders.
 2014-12-01 19:48:00 +00:00
John Spurlock
99e6086bcd am c5c0edae: am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev 
* commit 'c5c0edae5804b813a4f1548574f72d7c2097cc7e':
  Settings: Restart volumizers explicitly on resume.
 2014-12-01 19:46:52 +00:00
Geoff Mendal
8b88bcc751 am 80e4465b: (-s ours) am 80986508: (-s ours) Import translations. DO NOT MERGE 
* commit '80e4465b694bc67c39dab183fc5ea06f3c4ff04b':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:33 +00:00
Geoff Mendal
bfc2bfb5b6 am 3c1449d9: (-s ours) Import translations. DO NOT MERGE 
* commit '3c1449d9f6bcad5773067b11a8be8d88f8336f63':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:32 +00:00
John Spurlock
647bb8ff75 am c868f703: Settings: Improve inline volume sliders. 
* commit 'c868f7035a6d05332b3d8afcde2ae27ad0413e79':
  Settings: Improve inline volume sliders.
 2014-12-01 17:11:23 +00:00
John Spurlock
c868f7035a Settings: Improve inline volume sliders. 
- Track framework changes to show mute states for non-ringer streams
 - Update vibrate icon in sync with other system components.

Depends on:
  Ie2df52edb070055ef59c74039162a0e785d2fdbb

Bug: 17899613
Change-Id: Ib38c86600693e0f36fe72deb231ea751e0486af7
 2014-12-01 11:58:25 -05:00
John Spurlock
c5c0edae58 am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev 
* commit '7da7c2220d3a30fb3a1b57ee95caa9aec860a132':
  Settings: Restart volumizers explicitly on resume.
 2014-12-01 15:04:03 +00:00
John Spurlock
7da7c2220d Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev 2014-12-01 14:57:54 +00:00
Geoff Mendal
80e4465b69 am 80986508: (-s ours) Import translations. DO NOT MERGE 
* commit '80986508fcf1ac52cb6665283d093c90115cc3fe':
  Import translations. DO NOT MERGE
 2014-12-01 14:52:54 +00:00
Geoff Mendal
3c1449d9f6 Import translations. DO NOT MERGE 
Change-Id: Ibcb289b8a0129d1c7c56151febfecd991ccf534e
Auto-generated-cl: translation import
 2014-12-01 06:49:25 -08:00
Geoff Mendal
80986508fc Import translations. DO NOT MERGE 
Change-Id: I13501f8de184104974ced861598b0e87a52962f3
Auto-generated-cl: translation import
 2014-12-01 06:36:03 -08:00
Jeff Davidson
c18dfd696e am a56714af: am 2d93f36f: Add string for "Connected via Wi-Fi assistant". 
* commit 'a56714af6ea18d9c4299170644c53e89be025f84':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:52:57 +00:00
Jeff Davidson
a56714af6e am 2d93f36f: Add string for "Connected via Wi-Fi assistant". 
* commit '2d93f36f00226a45adf9ad2f001e599f95e61692':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:46:46 +00:00
Jeff Davidson
2d93f36f00 Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:37:07 -08:00
Geoff Mendal
5b09205cc6 am 237dbc45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '237dbc45c6558f6d93495f3580606f1a7cbf36b8':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:15 +00:00
Geoff Mendal
944c58a6bd am 6ab687e1: (-s ours) am 645cf17f: (-s ours) Import translations. DO NOT MERGE 
* commit '6ab687e1ee0d99b6a3cdd6270eebcb24dfb7795a':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:11 +00:00
Maurice Lam
edfc6a0a5f am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 
* commit '628e89e94580cd0734fe9aa85065e58021e8e9d8':
  [Setup] Theme ChooseLockGeneric for setup wizard
 2014-11-26 18:42:34 +00:00
Fabrice Di Meglio
7a9494d53e am e0658dda: am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit 'e0658ddafe8a73a551fc8626a96db07c9e905536':
  IllegalStateException fixed in print service settings
 2014-11-26 18:41:28 +00:00
John Spurlock
04b2e7957d Settings: Restart volumizers explicitly on resume. 
onBindView is no longer called in all cases, so use
onResume as an additional signal that the user returned
to the settings page.  onActivityStop is called in both
cases to cleanup.

Bug: 17461564
Change-Id: I73a6775260951d4fd82ca8c3d8eb852f8dcc7452
 2014-11-26 11:08:43 -05:00
Geoff Mendal
237dbc45c6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 14:57:46 +00:00
Geoff Mendal
6ab687e1ee am 645cf17f: (-s ours) Import translations. DO NOT MERGE 
* commit '645cf17f68bbf8580d9cc01a0527445c1c78e74d':
  Import translations. DO NOT MERGE
 2014-11-26 14:50:01 +00:00
Geoff Mendal
6c9140f030 Import translations. DO NOT MERGE 
Change-Id: Id6429feb2f156602b611e6578f624f30ff1997b7
Auto-generated-cl: translation import
 2014-11-26 06:38:44 -08:00
Geoff Mendal
645cf17f68 Import translations. DO NOT MERGE 
Change-Id: Ic5aaf08bc81e92023a18aafa0e5dde54adf8ea05
Auto-generated-cl: translation import
 2014-11-26 06:25:44 -08:00
Maurice Lam
628e89e945 am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 
* commit '3f9d8b60ca9d3815736a4e11d17565fe18524a28':
  [Setup] Theme ChooseLockGeneric for setup wizard
 2014-11-26 01:46:27 +00:00