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
31a262e739
am eeaf8608
: 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 'eeaf8608d3892337cd47635e4b6ba80c7ca7852b':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
2014-12-02 19:40:21 +00: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
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
b1178d36a6
am 96ba998a
: am 99348d69
: am da02111f
: Merge "Added color to Data Usage graph" into lmp-mr1-dev
...
* commit '96ba998a0b8d03cab6fa8558a0bfe3487de97158':
Added color to Data Usage graph
2014-12-02 18:19:48 +00:00
PauloftheWest
3969b6b7b2
am c33b2ee3
: am f28bd654
: am fc6a8bf2
: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
...
* commit 'c33b2ee31acffd9a729351452f5f0d3bbec87dba':
Fixed a Wi-Fi dialog crash
2014-12-02 18:19:47 +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
53a1e8ce6d
am 506607d1
: am 21316f1d
: am 41c29625
: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
...
* commit '506607d1f8c9b05b230e3031e41c2d97f1c78e28':
Remove extraneous SIM status information
2014-12-02 18:12:01 +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
Sanket Padawe
bcbe980986
New activity for enabling tethering using Quick Settings
...
Added a new activity which would handle tethering on clicking Tethering
tile of Quick Settings.
Bug: 18368949
Change-Id: I77057f3ccd26263831ba88e426b5f8d3ad1fa788
2014-12-02 09:45:35 -08:00
Zoltan Szatmary-Ban
546790c1ed
Show account icons for managed profiles on Settings > Factory Reset
...
Fixing a bug where managed profile's accounts where shown without
the account icon.
Bug: 18555032
Change-Id: I5a1094e795b31a00599bc4df413573030693b436
2014-12-02 17:22:10 +00:00
Yu Ning
4c25fe2724
Fix Settings app crash for devices with no USB support.
...
On emulator and any device that does not support USB connection, the
Settings app crashes as soon as the user tries to view the details of
an installed app. This is because the InstalledAppDetails activity
assumes that the USB service is always started, which is no longer
true due to a change in SystemServer.java (frameworks/base, Change-Id
I6dad511c652bcacc085f27ede5f8f22a6982c6bd). Adding null checks fixes
this issue.
Change-Id: I85263fb795ee06bd61ba28ec12a7161c1f17f4cc
Signed-off-by: Yu Ning <yu.ning@intel.com >
2014-12-02 17:52:42 +08:00
Maurice Lam
2bb84de81f
am 62009bf8
: am a2caf633
: am 1dce16a6
: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
...
* commit '62009bf8564accddf97ef3dbf6c90ae9286ea07c':
[WifiSetup] Swap buttons position in Skip dialog
2014-12-02 06:46:56 +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
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
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
fcdc4dd32c
am 72b29f9b
: am 86f184b3
: am 6b19fa90
: [FRP] Theming for Pattern and Password screens
...
* commit '72b29f9b7f6e9a0c0b9f8313df8897b29481292e':
[FRP] Theming for Pattern and Password screens
2014-12-02 01:35:45 +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
efa9cfadd7
am 9b63186b
: am 647bb8ff
: am c868f703
: Settings: Improve inline volume sliders.
...
* commit '9b63186b1f6b4bbfdb0ac8a33bccb70b3dd4b2e4':
Settings: Improve inline volume sliders.
2014-12-01 20:00:02 +00:00
John Spurlock
9f044dc8a4
am 99e6086b
: am c5c0edae
: am 7da7c222
: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
...
* commit '99e6086bcdb16d65cb4016879c682077ef5d2a76':
Settings: Restart volumizers explicitly on resume.
2014-12-01 20:00:01 +00:00
Geoff Mendal
e1ed5041d0
am 8b88bcc7
: (-s ours) am 80e4465b
: (-s ours) am 80986508
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8b88bcc7513cdbf0c965cab7596bea39cb6a4405':
Import translations. DO NOT MERGE
2014-12-01 19:59:59 +00:00
Geoff Mendal
00ffb3a6de
am bfc2bfb5
: (-s ours) am 3c1449d9
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bfc2bfb5b6b7aa84fef6ce903dc8e9f1f10753c8':
Import translations. DO NOT MERGE
2014-12-01 19:59:58 +00:00
Sanket Padawe
7666b547bf
Fixed improper capitalization related to trademark term in BT
...
Bug: 18362051
Change-Id: I3074e120a5b261fbcb5d429bae47d233ad6fd695
2014-12-01 19:53:53 +00: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
Geoff Mendal
2dd40e7ec8
Import translations. DO NOT MERGE
...
Change-Id: I937420a98ee4ffd48c61126f1cec59978043c5d3
Auto-generated-cl: translation import
2014-12-01 07:00:28 -08: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