Commit Graph

7370 Commits

Author SHA1 Message Date
Svetoslav
9b8912dbee am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
* commit 'fd3a3d79290799ec80c3bc9cfe965280428a8077':
  Fix an occasional crash in print job state fragment in Settings.
2014-09-05 17:17:51 +00:00
Svetoslav
3c0385e465 am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '527ecccce879471dd0096b72a4be584d35fe32d0':
  Update Settings due to API changes.
2014-09-05 17:17:50 +00:00
Svetoslav
fd3a3d7929 Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev 2014-09-05 17:10:06 +00:00
Svetoslav
527ecccce8 Merge "Update Settings due to API changes." into lmp-dev 2014-09-05 17:09:15 +00:00
Alexandra Gherghina
af0d9540c2 Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
Bug: 17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
2014-09-05 16:46:54 +01:00
Dan Sandler
6f0507add7 am 8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
* commit '8aed3e3f9e0bbb690866110581bde5c94e1fb490':
  Only fetch titles of ringtones coming from the MediaStore.
2014-09-05 15:29:28 +00:00
Dan Sandler
8aed3e3f9e Only fetch titles of ringtones coming from the MediaStore.
As a fallback we attempt to get DISPLAY_NAME from the
provider. Any other URIs probably don't have titles.

Bug: 14093281
Change-Id: I39adbad52ef6dcc1686cbc738457b55c33948bd6
2014-09-05 13:59:31 +00:00
Alexandra Gherghina
56645002b2 Reset Settings task when using the user switcher
Bug: 17294618
Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
2014-09-05 11:39:39 +01:00
Wink Saville
0e559d532c am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit 'aa188b539be9e5284febc141b6b7f06c0faef5b8':
  More cleanup prior to unhiding
2014-09-05 03:50:26 +00:00
Wink Saville
aa188b539b Merge "More cleanup prior to unhiding" into lmp-dev 2014-09-05 03:40:35 +00:00
Svetoslav
4a361df54b Fix an occasional crash in print job state fragment in Settings.
There is a NPE in the print settings if the following occurs:
We open the print job state UI in settings for an ongoing print
job (now we have action bar buttons for cancel and restart);
now the print job gets completed and we update the UI and
since the print job is not longer present we nullify the current
job reference and finish the activity. But since activity
is not finished immediately there is an opportunity for the
user to click on the action bar options which results in NPE.
The fix is to not update the print job instance in the update
UI method if the job is not available, i.e. the update method
does not mutate state if the job is no longer present, as we
are finishing and performing an operation on a finished job will
have no effect.

bug:17387134

Change-Id: I501ed1e05b8b70584b3299a16e93ead5ab7f155f
2014-09-04 19:54:21 -07:00
Svetoslav
39f82a7c98 Update Settings due to API changes.
bug:17390424

Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
2014-09-04 18:00:23 -07:00
Wink Saville
78b36ba35e More cleanup prior to unhiding
Rename public SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
2014-09-04 15:36:49 -07:00
Fabrice Di Meglio
a1c6288b13 am 0535ed55: Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev
* commit '0535ed559eca51cce107309d05a3858ae48f5f20':
  Fix bug #17393417 Developer Options are not indexed after activating them
2014-09-04 22:20:55 +00:00
Fabrice Di Meglio
0535ed559e Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev 2014-09-04 22:09:19 +00:00
Fabrice Di Meglio
f91b4dbc33 Fix bug #17393417 Developer Options are not indexed after activating them
- add forceUpdate field copy in the UpdateData copy constructor

Change-Id: I245ce76bf9798c359219e153d2af9d08e7e11903
2014-09-04 15:04:23 -07:00
PauloftheWest
4cebc12150 am 4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
* commit '4a1b7b5f942833937bd0e24082bb0dfff9e6ddf2':
  Bug fix: Toggling Bluetooth off then on will now initiate a scan.
2014-09-04 21:33:16 +00:00
PauloftheWest
4a1b7b5f94 Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev 2014-09-04 21:25:05 +00:00
PauloftheWest
6a1a6a943a Bug fix: Toggling Bluetooth off then on will now initiate a scan.
Bug: 17380015
Change-Id: Ie07d9a4f737df32aba7e400b028144f7a81cb37e
2014-09-04 14:10:24 -07:00
Chris Wren
2ed0ea2120 am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '0a59607e5eea0e94542edb8de533ccb8e258536b':
  Implement per-app sensitivity settings toggle.
2014-09-04 21:04:07 +00:00
Chris Wren
0a59607e5e Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 20:38:40 +00:00
Fabrice Di Meglio
f475cfa354 am ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
* commit 'ed1175cf0c6759671b40caa2ca5630e8325d97d1':
  Increase the delay for the Search result Ripple effect to happen
2014-09-04 20:17:10 +00:00
Fabrice Di Meglio
ed1175cf0c Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev 2014-09-04 20:06:23 +00:00
Fabrice Di Meglio
eced780ff5 Increase the delay for the Search result Ripple effect to happen
- will actually make the Ripple look better and a bit longer
(it was showing and disappearing a bit too fast)

See bug: #14974443

Change-Id: I7a0354c679cfa8d9596bcb957c922b8dcf88f0e3
2014-09-04 13:04:56 -07:00
Andres Morales
d572323580 am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit '1c09186d64f9f4188d0eccc5170f4bf4bbcf824d':
  Fix issue with wifi passwords >16 chars
2014-09-04 19:42:32 +00:00
Andres Morales
1c09186d64 Merge "Fix issue with wifi passwords >16 chars" into lmp-dev 2014-09-04 19:31:48 +00:00
Sky Faber
073f07f33b Remove UI for Forget AP as a secondary user.
Bug: 16898030
Bug: 17317819
Change-Id: I4ef17483bc1b35f2f70c23eb12d813f029b15bf0
2014-09-04 12:07:41 -07:00
Andres Morales
3902c785b0 Fix issue with wifi passwords >16 chars
Wasn't calculating their length in hex properly

Bug:17369745
Change-Id: I7652c10a2e0704877ad113fcbc04007845a862e3
2014-09-04 11:42:53 -07:00
PauloftheWest
357e2826e1 am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7':
  Material theme updates for Bluetooth Device picker.
2014-09-04 18:02:06 +00:00
PauloftheWest
0e73c521bd Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 2014-09-04 17:50:00 +00:00
PauloftheWest
0410a1e327 am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit '92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
  Fix the truncating of Bluetooth icons.
2014-09-04 17:49:48 +00:00
PauloftheWest
92de681ec3 Merge "Fix the truncating of Bluetooth icons." into lmp-dev 2014-09-04 17:34:17 +00:00
PauloftheWest
e32220eedc Material theme updates for Bluetooth Device picker.
Bug: 17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
2014-09-04 10:16:09 -07:00
Chris Wren
3d903185c7 Implement per-app sensitivity settings toggle.
Change-Id: Iaa1de63b720bf93bdf432117604740e509fe3ab0
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug: 16324353
2014-09-04 11:37:18 -04:00
PauloftheWest
a7aef13fbb Fix the truncating of Bluetooth icons.
Bug: 17347150
Change-Id: Iad6bec51bf9327ee0c6752ddaa161aec3b4ff590
2014-09-04 08:27:32 -07:00
Chris Wren
dd95e098f4 am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit 'ee846f8828f9e2988e646af85da55f3d51c02f27':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
2014-09-04 13:57:30 +00:00
Chris Wren
ee846f8828 missing dep. Revert "Implement per-app sensitivity settings toggle."
This reverts commit 56131de741.

Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
2014-09-04 15:49:58 +02:00
Chris Wren
cec4064552 am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
  Implement per-app sensitivity settings toggle.
2014-09-04 13:46:49 +00:00
Chris Wren
77fdc93bcd Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 13:40:04 +00:00
Dan Sandler
84176e5691 am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit 'feec34cec83b87f0c9e88b0d5883bd65170398bf':
  Don't block notifications from system packages.
2014-09-04 13:25:34 +00:00
Dan Sandler
feec34cec8 Merge "Don't block notifications from system packages." into lmp-dev 2014-09-04 13:15:48 +00:00
Zoltan Szatmary-Ban
4c035b8fe4 am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
* commit '1e0ea452635fb3e8fbac733567489a38ee3ed635':
  Start activity for the correct user in Settings > Data Usage
2014-09-04 12:05:48 +00:00
Zoltan Szatmary-Ban
1e0ea45263 Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 2014-09-04 11:55:49 +00:00
Alexandra Gherghina
c24310c963 am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
* commit '9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
  Code clean-ups following moving the managed profile under accounts
2014-09-04 09:36:20 +00:00
Alexandra Gherghina
9dce0791f8 Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 2014-09-04 09:26:03 +00:00
Elliott Hughes
7253df35a0 Start cleaning up percentage formatting in Settings.
This fixes some of the percentage formatting issues, but there are
still about ten strings with hard-coded %%s in them.

Bug: 15476051
Change-Id: I668b6b16e598425f6006f6de0005c980f613f5b2
2014-09-03 17:04:01 -07:00
PauloftheWest
b448ea3a33 am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
* commit '7641e1ad44f6006cac1bd1b88ca09b3bab2cca78':
  Fixed an issue were "Saved Networks" would not appear correctly.
2014-09-03 23:24:29 +00:00
Fabrice Di Meglio
842feb8961 am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
* commit '52a48226ec0566570afd6f0d2c5287d9b727b339':
  Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed
2014-09-03 23:23:22 +00:00
Wink Saville
a535fcb5b3 am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev
* commit '418346d5cf6c41162031a0731927502f503163a1':
  Prepare to make SubscriptionManager public.
2014-09-03 23:21:09 +00:00
Dan Sandler
d283f0fbd5 Don't block notifications from system packages.
Bug: 16703366
Change-Id: Id2f635e4e99df0c10afff8a0f5130179d381762c
2014-09-03 22:14:50 +00:00