Commit Graph

20266 Commits

Author SHA1 Message Date
Geoff Mendal
23562e4605 Import translations. DO NOT MERGE
Change-Id: I05bb4f3a511b9b620bb9fbcf0a9be40ece9eb0ad
Auto-generated-cl: translation import
2015-04-25 00:12:23 -07:00
Etan Cohen
a0128ff0bf Merge changes from topic 'mwd-merge-042415'
* changes:
  Merge commit '377c7c9' into merge2
  Merge commit '22ffff6' into merge2
2015-04-25 00:51:57 +00:00
Andres Morales
93564706e1 Merge "Fix crash when rotating NFC dialog" 2015-04-24 23:19:36 +00:00
Etan Cohen
a09725c513 Merge commit '377c7c9' into merge2 2015-04-24 14:39:03 -07:00
Etan Cohen
6b7c383bd0 Merge commit '22ffff6' into merge2 2015-04-24 14:38:56 -07:00
Jorim Jaggi
817178fda2 Merge changes from topic 'fingerprint_ui'
* changes:
  Add dialog when user touches fingerprint icon
  Add pulsing animation for find sensor.
  Update fingerprint enroll UI to spec.
2015-04-24 21:34:39 +00:00
Jorim Jaggi
3b7f2efd95 Add dialog when user touches fingerprint icon
Bug: 20495507
Change-Id: I6779aba7ca988fd9a8eee07afca2a410de144a26
2015-04-24 14:26:44 -07:00
Jorim Jaggi
2fef19dd16 Add pulsing animation for find sensor.
Bug: 20495507
Change-Id: I5fefb2cdb2625885c906fa2a9b69da1141ce66e0
2015-04-24 14:26:32 -07:00
Jorim Jaggi
5ad75f07b1 Update fingerprint enroll UI to spec.
Also adds sliding animations between the steps.

Bug: 20495507
Change-Id: I148d8d8b8082361149f02fd2dc4cead0ba3e2526
2015-04-24 14:26:15 -07:00
Alan Viverette
13f8303086 am 4a4f487e: am b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
* commit '4a4f487e5bfd88644421fd139735543b4a5c7be9':
  Settings: Fix wifi developer options summaries
2015-04-24 21:08:07 +00:00
Alan Viverette
4a4f487e5b am b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
* commit 'b6073c486cb2eb537fd6e53000dce55afe762fc1':
  Settings: Fix wifi developer options summaries
2015-04-24 18:41:05 +00:00
Alan Viverette
b6073c486c am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
* commit '93ecb1f0124da17c55ad52fe572eaf4a8c3868d5':
  Settings: Fix wifi developer options summaries
2015-04-24 18:28:50 +00:00
Alan Viverette
93ecb1f012 Merge "Settings: Fix wifi developer options summaries" 2015-04-24 18:05:10 +00:00
Maurice Lam
5c012ec482 Merge "[WifiSetup] Update Wi-Fi icon color" 2015-04-24 17:55:57 +00:00
Maurice Lam
bb1348a88f [WifiSetup] Update Wi-Fi icon color
Bug: 20551141
Change-Id: I69a534e8f452ba11be679d8231022b9223caaed3
2015-04-24 09:29:04 -07:00
Zoltan Szatmary-Ban
6221467fae Fix NPE when tapping on Add Network in Settings > WiFi
Bug:20542955
Change-Id: I06cfc21f906f94b2b61f2121c22c3d3318c9e65b
2015-04-24 17:27:25 +01:00
Nicolas Prevot
5e65ecf228 Merge "Give MANAGE_PROFILE_AND_DEVICE_OWNERS to Settings." 2015-04-24 15:08:52 +00:00
John Spurlock
b0eae7ee80 Merge "Settings: Ensure zen day-of-week formats use current locale." 2015-04-24 12:54:44 +00:00
Jason Monk
c0f93fc1db Merge "Tint dashboard items coming from external tiles" 2015-04-24 11:48:46 +00:00
Jeff Sharkey
954d8dad5e Migrate package movement to use new API.
We now kick off the move immediately, and pass along the "ID" of the
move in progress.  This allows the progress activity to be completely
destroyed and recreated without kicking off a second conflicting move
operation.

Also uses new cleaner movement API that accepts direct VolumeInfo.

Bug: 19993667
Change-Id: I28bc268fcb42dfc9152020b16ef7058d63157597
2015-04-23 20:11:48 -07:00
John Spurlock
4f8d4f0d2b Settings: Ensure zen day-of-week formats use current locale.
Don't share SimpleDateFormat instances per-process, convert to
per-instance to ensure we're always using the current locale.

Updated version of:
  https://android-review.googlesource.com/#/c/147246/

Change-Id: Id464c35035c1de0a7894e5e19b57934f77df9769
2015-04-23 20:32:56 -04:00
Tony Mantler
3a8a17d733 Merge "Move StorageMeasurement to SettingsLib" 2015-04-23 22:40:10 +00:00
Tony Mantler
d325f5d53c Move StorageMeasurement to SettingsLib
Change-Id: I00335fe896ef1bae11c382592eea2a354269818a
2015-04-23 15:23:44 -07:00
Hemant Gupta
dd796e81c3 Bluetooth: HID: Use proper values of connection status
This patch fixes issue in retrieving correct connection status when
more than one hid device was connected to DUT. In such situation
current implementation was sending STATE_DISCONNECTED as connection
state because of wrong check of matching device as 1st device in
connected device list. Instead of this now actual connection state
device is retrieved from HidService.

Change-Id: I2c766e9fc6eb9e97c3745016e38fa5c374c16539
2015-04-23 21:30:03 +00:00
Jason Monk
50aa8a99eb Merge "Fix crash in notifications app list" 2015-04-23 19:56:21 +00:00
Jason Monk
365b3a6b4b Fix crash in notifications app list
Bug: 20310018
Change-Id: I670c4cd10607c84a6c185d6dce579da497b6bb65
2015-04-23 15:45:54 -04:00
Jason Monk
208b17ef81 Merge "Update notification strings in app info" 2015-04-23 18:46:46 +00:00
Jason Monk
a3cfe9e127 Update notification strings in app info
Bug: 20496114
Change-Id: I98698ae082fec614d0480697885049ffe2e8dcf7
2015-04-23 14:41:04 -04:00
Maurice Lam
e14bee71e6 Merge "[WifiSettings] Vector drawables for Wi-Fi signal icon" 2015-04-23 18:14:45 +00:00
Jason Monk
be292a5d52 Merge "Change owner info to be a dialog rather than screen" 2015-04-23 18:08:21 +00:00
Maurice Lam
b50dfb706c [WifiSettings] Vector drawables for Wi-Fi signal icon
Update wifi_signal to be a vector drawable that uses the color
from the theme attribute wifi_signal_color.

Bug: 20452312
Change-Id: Id151406e7dd3487050a0d3f440b0d620c8c84dcb
2015-04-23 11:01:09 -07:00
Jason Monk
fb22526104 Merge "Allow users to re-enable apps once disabling them" 2015-04-23 17:55:34 +00:00
Yorke Lee
b0b514a2f6 Merge "Add default phone app to system settings" 2015-04-23 17:35:49 +00:00
Maurice Lam
83172e0f63 Merge "[LockSetup] Add padding to lock setup screens" 2015-04-23 17:24:05 +00:00
Jason Monk
3d0bc10ce2 Allow users to re-enable apps once disabling them
Entries in the app list should not be disabled, instead we should
be filtering for only items the user can modify.

Bug: 20210219
Change-Id: Ida298a9ba16c1201ac238b85f299bdc7b0ae7a1d
2015-04-23 13:14:32 -04:00
Jason Monk
47d16e9bf6 Tint dashboard items coming from external tiles
So they can match the Settings theme.

Bug: 20449897
Change-Id: I33ad0d78dad6fbc9dae35552246a559b6508deaf
2015-04-23 12:41:40 -04:00
Jason Monk
1049f4d81b Merge "New UX for app usage screen" 2015-04-23 14:42:21 +00:00
Jason Monk
d8da51ccfe New UX for app usage screen
Now uses ManageApplications base, and has a details screen which has
a switch and a link to optional app settings.

Bug: 20290386
Change-Id: If32ce8d82e55f3908644c575925b3f6506a68e6e
2015-04-23 10:37:59 -04:00
Maurice Lam
38573a5670 [LockSetup] Add padding to lock setup screens
Add SuwContentFrame to the style of the lock screen setup screens so
that paddings are applied.

Bug: 19612353
Change-Id: I8ca42b23f03c48b670fce0966ea537ddf8919b7b
2015-04-22 17:37:14 -07:00
Sanket Padawe
55d4d75f4a Disable data sim selection when phone call active.
Bug: 19301456
Bug: 19150497
Change-Id: I396641b24e78616c93510bf367b61fa7c47ec068
2015-04-22 16:21:56 -07:00
Maurice Lam
a15b87544e Merge "[Setup] Use SetupWizardLayout" 2015-04-22 17:36:50 +00:00
Robin Lee
1e13caf969 Merge "vpn2: show third-party VPN services" 2015-04-22 16:41:21 +00:00
Nicolas Prevot
189294e26b Give MANAGE_PROFILE_AND_DEVICE_OWNERS to Settings.
This permission will be required to set the profile owner.

Change-Id: I695f73b5fddfa7652b04e5e929ce9e91e62dc081
2015-04-22 17:15:30 +01:00
Jason Monk
3bcd76ce63 Change owner info to be a dialog rather than screen
Bug: 15937670
Change-Id: I8d8609ff165c4a76e318a80a62fb1dc9effbc82a
2015-04-22 11:14:14 -04:00
Geoff Mendal
6d61061518 Import translations. DO NOT MERGE
Change-Id: I921201f47bbaa1b29c6f4c42131123c439207e40
Auto-generated-cl: translation import
2015-04-22 08:11:16 -05:00
Zoltan Szatmary-Ban
008c9238d9 Merge "Show dialog when user tries to edit a locked down WiFi config" 2015-04-22 10:10:36 +00:00
Yorke Lee
dc868a18f8 Add default phone app to system settings
Bug: 20303635

Change-Id: Ibf052fa92347bff49a638c4042d899c9d6587410
2015-04-21 17:26:16 -07:00
Lucky Zhang
86b44796c5 Merge "[SetupWizard] Refactor WifiSetupActivity" 2015-04-21 22:42:56 +00:00
Lucky Zhang
a62d2c800c [SetupWizard] Refactor WifiSetupActivity
Refactor WifiSetupActivity to respect the conventional logic of Setup
Wizard's SubactivityWrapper. WifiSetupActivity now returns the result
code back to WifiSettingsWrapper and lets the Wrapper invoke
WizardManager, instead of invoking WizardManager by itself and letting
its Wrapper finish early.

The related change in WifiSettingsWrapper on Setup Wizard side is
ag/676788.

Bug: 20309008
Change-Id: Ia3bc2ff390404ff87c427782b5e7b345050bea03
2015-04-21 15:09:40 -07:00
Jeff Sharkey
267582826b Merge "Use disk directly from volume in storage wizard." 2015-04-21 19:55:11 +00:00