Amith Yamasani
375baea456
Follow API change for method name
...
Bug: 17389920
Change-Id: I5c5bdacd863f84c503e7a16dc611feda36bc462f
2014-09-05 10:23:04 -07:00
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
Jorim Jaggi
60b7e88289
am f7cdbc3a
: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
...
* commit 'f7cdbc3a68fc5a900b3d2f2d910b2990410737db':
Remove weird divider from confirm_lock_pattern
2014-09-05 16:15:01 +00:00
Jorim Jaggi
f7cdbc3a68
Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
2014-09-05 16:06:26 +00:00
Jorim Jaggi
d3a2ec0cbb
Remove weird divider from confirm_lock_pattern
...
Bug: 16686614
Change-Id: I5b62a220181e384328a3b27e05a218a5984e23d1
2014-09-05 17:56:17 +02:00
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
af0d9540c2
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
...
Bug: 17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
2014-09-05 16:46:54 +01: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
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
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
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
Andres Morales
7c5d31f8e7
New black drawables for tap and pay
...
Much more visible than the white ones on a white bg
Bug:17155785
Change-Id: I1c135ca819ee6734289777b3e694c7548777cb84
2014-09-04 12:11:26 -07: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
Baligh Uddin
19843ad15e
am 87c7cec8
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '87c7cec8ea12dba610dcc4ccfe9896470e45f229':
Import translations. DO NOT MERGE
2014-09-04 18:49:53 +00: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
Baligh Uddin
87c7cec8ea
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-04 18:34:46 +00:00
Baligh Uddin
184a7b4fd3
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-04 18:34:44 +00: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