Alexandra Gherghina
da1e8c75fb
am 51712241
: Fix typo in intent filter
...
* commit '51712241f50f95d9bf8e83428ce5428f7f476431':
Fix typo in intent filter
2014-09-05 15:54:03 +00:00
Alexandra Gherghina
3b17ac2007
am 51712241
: Fix typo in intent filter
...
* commit '51712241f50f95d9bf8e83428ce5428f7f476431':
Fix typo in intent filter
2014-09-05 15:53:32 +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
Alexandra Gherghina
2374ba326b
am 5af932e0
: am 9b6ab158
: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
...
* commit '5af932e0072bd99be7bcf5f63b301c680345531e':
Update Settings cross-profile intent filters upon OTA
2014-09-05 15:43:22 +00:00
Dan Sandler
7bc5e4b656
am f4a34a1d
: am 8aed3e3f
: Only fetch titles of ringtones coming from the MediaStore.
...
* commit 'f4a34a1d3b4339c24f7d7563eb13f9222d1f377d':
Only fetch titles of ringtones coming from the MediaStore.
2014-09-05 15:43:19 +00:00
Alexandra Gherghina
51712241f5
Fix typo in intent filter
...
Bug: 16647771
Change-Id: I44c46a92fee23f78591677f7ea399fd963b4df16
2014-09-05 16:32:15 +01:00
Alexandra Gherghina
8378516b0b
am 9b6ab158
: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
...
* commit '9b6ab1584cb1087689acacf95c0ed5c2f58a2f15':
Update Settings cross-profile intent filters upon OTA
2014-09-05 15:29:28 +00: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
Alexandra Gherghina
5af932e007
am 9b6ab158
: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
...
* commit '9b6ab1584cb1087689acacf95c0ed5c2f58a2f15':
Update Settings cross-profile intent filters upon OTA
2014-09-05 15:29:17 +00:00
Dan Sandler
f4a34a1d3b
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:16 +00:00
Alexandra Gherghina
9b6ab1584c
Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
2014-09-05 15:26:59 +00:00
Alexandra Gherghina
c4916832d0
Update Settings cross-profile intent filters upon OTA
...
Bug: 16647771
Change-Id: I2e23d26b425bde5339221851ac54aab760dc1cc9
2014-09-05 15:27:04 +01: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
05dec7fc69
Splits out ACTION_MAIN intent filter for Settings and doesn't
...
forward it.
This is required so that general queries for ACTION_MAIN apps
do not get stuck with the IntentForwarderActivity.
Bug: 17053933
Change-Id: Ie04e2b29f2467e14fd82d27c1e94d93eda90f4c1
2014-09-05 14:58:04 +01: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
Barnaby James
cec8e2fe78
Remove intent filter for Airplane mode voice activity.
...
Change-Id: I7f217350fdb51c2a88c92777d33c021dd32cd07e
Bug: 17398731
2014-09-04 21:59:09 -07:00
Wink Saville
ef73fae8a4
am de838b00
: am aa188b53
: Merge "More cleanup prior to unhiding" into lmp-dev
...
* commit 'de838b000146057e25c973556a6763d42086f706':
More cleanup prior to unhiding
2014-09-05 04:26:15 +00: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
de838b0001
am aa188b53
: Merge "More cleanup prior to unhiding" into lmp-dev
...
* commit 'aa188b539be9e5284febc141b6b7f06c0faef5b8':
More cleanup prior to unhiding
2014-09-05 03:49:53 +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
96c5dd3cc4
am e7b63681
: am 0535ed55
: Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev
...
* commit 'e7b63681b2b328df4b885047f28f1681edcff356':
Fix bug #17393417 Developer Options are not indexed after activating them
2014-09-04 22:27:01 +00: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
e7b63681b2
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:53 +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
fbf89801bc
am f4040b3c
: am 4a1b7b5f
: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
...
* commit 'f4040b3cd138fcba53b9b122ab14decefc5b67a7':
Bug fix: Toggling Bluetooth off then on will now initiate a scan.
2014-09-04 21:39:45 +00: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
f4040b3cd1
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:08 +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
Chris Wren
d21d8b3dc0
am 15230e79
: am 0a59607e
: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
...
* commit '15230e79b4420cd5122652538078dd9dbdfce17c':
Implement per-app sensitivity settings toggle.
2014-09-04 21:16:42 +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
15230e79b4
am 0a59607e
: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
...
* commit '0a59607e5eea0e94542edb8de533ccb8e258536b':
Implement per-app sensitivity settings toggle.
2014-09-04 21:07:35 +00: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
edea9f5a69
am bb93da54
: am ed1175cf
: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
...
* commit 'bb93da541f585b541e9cfc8daeb515c94dd6eda0':
Increase the delay for the Search result Ripple effect to happen
2014-09-04 20:22:56 +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
bb93da541f
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:04 +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
2f41e0b3eb
am 13a0e67a
: am 5c9a3b0d
: Merge "New black drawables for tap and pay" into lmp-dev
...
* commit '13a0e67a01014dcbb0836d00d8d72dfc9f9a10b2':
New black drawables for tap and pay
2014-09-04 19:54:04 +00:00
Andres Morales
b5394ac033
am 20a5bf28
: am 1c09186d
: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
...
* commit '20a5bf285ae5ffcee03a2b746438532740be17a5':
Fix issue with wifi passwords >16 chars
2014-09-04 19:54:03 +00:00
Andres Morales
13a0e67a01
am 5c9a3b0d
: Merge "New black drawables for tap and pay" into lmp-dev
...
* commit '5c9a3b0d87ef4dc1b82edac191fbc6e8101aaad6':
New black drawables for tap and pay
2014-09-04 19:43:29 +00:00
Andres Morales
20a5bf285a
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:43:28 +00:00
Andres Morales
db9745e43a
am 5c9a3b0d
: Merge "New black drawables for tap and pay" into lmp-dev
...
* commit '5c9a3b0d87ef4dc1b82edac191fbc6e8101aaad6':
New black drawables for tap and pay
2014-09-04 19:42:33 +00: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
5c9a3b0d87
Merge "New black drawables for tap and pay" into lmp-dev
2014-09-04 19:31:57 +00:00
Andres Morales
1c09186d64
Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
2014-09-04 19:31:48 +00:00