Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,526 Commits 1 Branch 0 Tags
b58859a72345c13f332f2bf6ace3fb52f02bf258
Commit Graph

7288 Commits

Author SHA1 Message Date
Sanket Padawe
b58859a723 am 408f0a29: am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev 
* commit '408f0a29547a4e2d1ebfc828dea52133788f10a6':
  Fixed crash in sim settings due to wrong toString() call.
 2014-12-03 20:40:04 +00:00
Maurice Lam
2ecc0107dc am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 
* commit '94c85309b297e5c63d54b9a76f27e9119779411e':
  [FRP] Theme interstitials for lock screen setup
 2014-12-03 20:40:02 +00:00
Sanket Padawe
37a0c07b9b Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev 2014-12-03 01:32:26 +00:00
Maurice Lam
7b484b9af0 Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 2014-12-03 01:27:57 +00:00
Lucky Zhang
23ab054dd9 am 955f412c: am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 
* commit '955f412c4ba854c965f2aaf7ba96b4cda43b99b9':
  [FRP] Show FRP warning when disabling secure unlock
 2014-12-03 00:01:31 +00:00
Lucky Zhang
91177d1c16 Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 2014-12-02 23:45:56 +00:00
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
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
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
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
Sanket Padawe
e06387ff5b Fixed crash in sim settings due to wrong toString() call. 
Bug: 18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4
 2014-12-02 18:54:11 +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
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
Maurice Lam
ecd2b7b81f [FRP] Theme interstitials for lock screen setup 
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.

Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
 2014-12-01 20:24:08 -08: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
1dce16a61c Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 2014-12-02 02:59:10 +00:00
Lucky Zhang
3bcea0289b [FRP] Show FRP warning when disabling secure unlock 
Added a dialog fragment to display warning message about disabling
device protection features when changing from a secure unlock
method to an insecure one.

Bug: 18509782
Change-Id: I0eaa9ff55c14092d8b3361d10da8b4530dd79bee
 2014-12-01 18:49:10 -08: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
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
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
7da7c2220d Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev 2014-12-01 14:57:54 +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
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
Maurice Lam
3f9d8b60ca Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 2014-11-26 01:15:36 +00:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard 
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
 2014-11-25 16:52:10 -08:00
Fabrice Di Meglio
09d2763715 Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 2014-11-26 00:31:50 +00:00
Fabrice Di Meglio
d5a4dae8d8 am c5aa905a: Merge "IllegalStateException fixed in print service settings" 
* commit 'c5aa905a31e48fdeb52a8591ebb018ff161d57ad':
  IllegalStateException fixed in print service settings
 2014-11-25 23:23:16 +00:00
Raju Yadav
21dba1f0e7 IllegalStateException fixed in print service settings 
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: I96052f95689ae17dd1b4e9d1c313100b7b47a599
 2014-11-25 15:08:14 -08:00
PauloftheWest
ae680e3c67 Fixed a Wi-Fi dialog crash 
Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
 2014-11-25 12:27:07 -08:00
Adrian Roos
9fc6bf3f37 am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit 'b3e88b6e209992b5ce8dabfb95bb5dfb6aa79425':
  Don't show RedactionInterstitial when changing password
 2014-11-25 18:45:43 +00:00
Paul Crowley
1abdd7c981 am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '7bd7823758fa88c295858466a0ffd5f5468a1452':
  Reduce number of attempts before factory reset to 30.
 2014-11-25 15:08:33 +00:00
Selim Cinek
51a36c6766 am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '2a65b1b105b6b1b0ea8f8b82df6833f2eadca5bd':
  Fixed build breakage due to api change.
 2014-11-25 15:08:14 +00:00
Zoltan Szatmary-Ban
7a2e5f1b03 am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '4a30d627a25f2e6cf3d699c4949919aae7ca7063':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-25 15:08:02 +00:00
Adrian Roos
647f9752ce Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev 2014-11-25 15:00:00 +00:00
PauloftheWest
c80b7616ca Added color to Data Usage graph 
+ Fixed some issues with displaying multiple SIMs in Data Usage.

Bug: 18466592
Bug: 18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17
 2014-11-25 04:58:22 -08:00
Raju Yadav
7468085405 IllegalStateException fixed in print service settings 
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: If9c76fe3ff040c295f0af9c092e8824b9a1371d7
 2014-11-25 13:26:42 +01:00
Wink Saville
c1ded7e23f am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'fd0c6eb52326ae18d9b82c71b57c0cdef88344fd':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:05:59 +00:00
Lajos Molnar
8b2c19b578 am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer 
* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
  Reword NuPlayer developer settings to say AwesomePlayer
 2014-11-24 18:05:54 +00:00
Andres Morales
877e9de67b am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev 
* commit 'e6d4aba3e1686084833a09d1fcdabf91fc35b0b6':
  Update enable oem unlock warning
 2014-11-24 18:05:33 +00:00
Adrian Roos
90d6c568cf Don't show RedactionInterstitial when changing password 
Only show when going from an insecure to secure lock.

Bug: 18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7
 2014-11-24 17:33:56 +01:00
Narayan Kamath
0d9fece9e8 am eb7795ed: Merge "Use shortFormat instead of shortFormat4." 
* commit 'eb7795ed31ee84c5569490b0949ea271865de7d8':
  Use shortFormat instead of shortFormat4.
 2014-11-24 16:07:21 +00:00
Paul Crowley
95a28c3f10 Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 2014-11-24 15:21:56 +00:00