Commit Graph

17849 Commits

Author SHA1 Message Date
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
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
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
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
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
Matthew Xie
7de119ca69 Check remote device uuids for phone book access permission
Only give phone book access permission for remote devices that
handle PBAP.
Bug: 18140961

Change-Id: I128f15460b151d7e0a47cd9b4b15dae10ec586c5
2014-11-26 13:32:48 -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
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
e0658ddafe am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
* commit '09d276371560a8e20e80a7f05a6807b5b8f0ace3':
  IllegalStateException fixed in print service settings
2014-11-26 00:37:43 +00: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
Fabrice Di Meglio
c5aa905a31 Merge "IllegalStateException fixed in print service settings" 2014-11-25 23:12:38 +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